From 1d190eaba0900b45da5aa2893bd8633e936ca8e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 25 Sep 2019 16:20:57 +0000 Subject: [PATCH 001/116] Update dependencies from https://github.com/dotnet/arcade build 20190924.3 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19474.3 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19474.3 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19474.3 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 +-- eng/Versions.props | 2 +- eng/common/enable-cross-org-publishing.ps1 | 6 ++ eng/common/sdl/extract-artifact-packages.ps1 | 7 ++ .../channels/netcore-3-tools-validation.yml | 95 +++++++++++++++++++ ...netcore-dev-30.yml => netcore-3-tools.yml} | 44 +++++---- .../post-build/channels/netcore-dev-31.yml | 8 +- .../post-build/channels/netcore-dev-5.yml | 8 +- .../channels/netcore-internal-30.yml | 8 +- .../channels/netcore-release-30.yml | 8 +- .../channels/netcore-release-31.yml | 8 +- .../channels/netcore-tools-latest.yml | 8 +- ...lease.yml => netcore-tools-validation.yml} | 12 ++- .../templates/post-build/common-variables.yml | 14 ++- .../templates/post-build/post-build.yml | 15 ++- global.json | 4 +- 17 files changed, 205 insertions(+), 56 deletions(-) create mode 100644 eng/common/enable-cross-org-publishing.ps1 create mode 100644 eng/common/templates/post-build/channels/netcore-3-tools-validation.yml rename eng/common/templates/post-build/channels/{netcore-dev-30.yml => netcore-3-tools.yml} (82%) rename eng/common/templates/post-build/channels/{public-validation-release.yml => netcore-tools-validation.yml} (90%) diff --git a/NuGet.config b/NuGet.config index 46f8b50c8491..acc24b827fda 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,7 +1,6 @@ - @@ -9,6 +8,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8631795af940..2fc13da5099c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -412,17 +412,17 @@ https://github.com/aspnet/Extensions 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/dotnet/arcade - f8546fbab59a74a66c83b8cb76b3f6877ce1d374 + 0e9ffd6464aff37aef2dc41dc2162d258f266e32 - + https://github.com/dotnet/arcade - f8546fbab59a74a66c83b8cb76b3f6877ce1d374 + 0e9ffd6464aff37aef2dc41dc2162d258f266e32 - + https://github.com/dotnet/arcade - f8546fbab59a74a66c83b8cb76b3f6877ce1d374 + 0e9ffd6464aff37aef2dc41dc2162d258f266e32 https://github.com/aspnet/Extensions diff --git a/eng/Versions.props b/eng/Versions.props index c7f31b506f1a..8f12ae3ec2f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,7 +68,7 @@ --> - 1.0.0-beta.19462.4 + 1.0.0-beta.19474.3 3.3.1-beta4-19462-11 diff --git a/eng/common/enable-cross-org-publishing.ps1 b/eng/common/enable-cross-org-publishing.ps1 new file mode 100644 index 000000000000..eccbf9f1b16d --- /dev/null +++ b/eng/common/enable-cross-org-publishing.ps1 @@ -0,0 +1,6 @@ +param( + [string] $token +) + +Write-Host "##vso[task.setvariable variable=VSS_NUGET_ACCESSTOKEN]$token" +Write-Host "##vso[task.setvariable variable=VSS_NUGET_URI_PREFIXES]https://dnceng.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/dnceng/;https://devdiv.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/devdiv/" diff --git a/eng/common/sdl/extract-artifact-packages.ps1 b/eng/common/sdl/extract-artifact-packages.ps1 index 1fdbb14329c4..6e6825013bf5 100644 --- a/eng/common/sdl/extract-artifact-packages.ps1 +++ b/eng/common/sdl/extract-artifact-packages.ps1 @@ -5,6 +5,13 @@ param( $ErrorActionPreference = "Stop" Set-StrictMode -Version 2.0 + +# `tools.ps1` checks $ci to perform some actions. Since the post-build +# scripts don't necessarily execute in the same agent that run the +# build.ps1/sh script this variable isn't automatically set. +$ci = $true +. $PSScriptRoot\..\tools.ps1 + $ExtractPackage = { param( [string] $PackagePath # Full path to a NuGet package diff --git a/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml b/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml new file mode 100644 index 000000000000..cdb74031fcfc --- /dev/null +++ b/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml @@ -0,0 +1,95 @@ +parameters: + artifactsPublishingAdditionalParameters: '' + publishInstallersAndChecksums: false + +stages: +- stage: NetCore_3_Tools_Validation_Publish + dependsOn: validate + variables: + - template: ../common-variables.yml + displayName: .NET 3 Tools - Validation Publishing + jobs: + - template: ../setup-maestro-vars.yml + + - job: publish_assets + displayName: Publish Assets + dependsOn: setupMaestroVars + variables: + - group: DotNet-Blob-Feed + - group: AzureDevOps-Artifact-Feeds-Pats + - name: BARBuildId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + - name: IsStableBuild + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NETCore_3_Tools_Validation_Channel_Id)) + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: current + artifactName: PackageArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: current + artifactName: BlobArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Asset Manifests + inputs: + buildType: current + artifactName: AssetManifests + + - task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + + - task: PowerShell@2 + displayName: Publish Assets + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) + /p:IsStableBuild=$(IsStableBuild) + /p:IsInternalBuild=$(IsInternalBuild) + /p:RepositoryName=$(Build.Repository.Name) + /p:CommitSha=$(Build.SourceVersion) + /p:NugetPath=$(NuGetExeToolPath) + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:Configuration=Release + /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} + /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) + /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) + /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) + /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + /p:PublishToAzureDevOpsNuGetFeeds=true + /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + ${{ parameters.artifactsPublishingAdditionalParameters }} + + - template: ../../steps/promote-build.yml + parameters: + ChannelId: ${{ variables.NETCore_3_Tools_Validation_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-dev-30.yml b/eng/common/templates/post-build/channels/netcore-3-tools.yml similarity index 82% rename from eng/common/templates/post-build/channels/netcore-dev-30.yml rename to eng/common/templates/post-build/channels/netcore-3-tools.yml index 69f1a9013e04..70eec773e750 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-30.yml +++ b/eng/common/templates/post-build/channels/netcore-3-tools.yml @@ -4,18 +4,18 @@ parameters: publishInstallersAndChecksums: false stages: -- stage: NetCore_Dev30_Publish +- stage: NetCore_3_Tools_Publish dependsOn: validate variables: - template: ../common-variables.yml - displayName: .NET Core 3.0 Dev Publishing + displayName: .NET 3 Tools Publishing jobs: - template: ../setup-maestro-vars.yml - job: displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_30_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_3_Tools_Channel_Id)) variables: - group: DotNet-Symbol-Server-Pats pool: @@ -56,7 +56,7 @@ stages: value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_30_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_3_Tools_Channel_Id)) pool: vmImage: 'windows-2019' steps: @@ -85,42 +85,46 @@ stages: - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish Assets - env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:ArtifactsCategory=$(_DotNetArtifactsCategory) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:Configuration=Release /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }} + ChannelId: ${{ variables.NetCore_3_Tools_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/netcore-dev-31.yml b/eng/common/templates/post-build/channels/netcore-dev-31.yml index 720a0ab08a22..db21254187d9 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-31.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-31.yml @@ -85,10 +85,14 @@ stages: - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish Assets - env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet diff --git a/eng/common/templates/post-build/channels/netcore-dev-5.yml b/eng/common/templates/post-build/channels/netcore-dev-5.yml index 9c81e39e9cf8..c4f5a16acb62 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-5.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-5.yml @@ -85,10 +85,14 @@ stages: - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish Assets - env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet diff --git a/eng/common/templates/post-build/channels/netcore-internal-30.yml b/eng/common/templates/post-build/channels/netcore-internal-30.yml index 053163cf6ade..177b38df3571 100644 --- a/eng/common/templates/post-build/channels/netcore-internal-30.yml +++ b/eng/common/templates/post-build/channels/netcore-internal-30.yml @@ -84,10 +84,14 @@ stages: - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish Assets - env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet diff --git a/eng/common/templates/post-build/channels/netcore-release-30.yml b/eng/common/templates/post-build/channels/netcore-release-30.yml index 8ba9237ffc04..16ade0db29de 100644 --- a/eng/common/templates/post-build/channels/netcore-release-30.yml +++ b/eng/common/templates/post-build/channels/netcore-release-30.yml @@ -85,10 +85,14 @@ stages: - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish Assets - env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet diff --git a/eng/common/templates/post-build/channels/netcore-release-31.yml b/eng/common/templates/post-build/channels/netcore-release-31.yml index d8270eadaeab..01d56410c7d4 100644 --- a/eng/common/templates/post-build/channels/netcore-release-31.yml +++ b/eng/common/templates/post-build/channels/netcore-release-31.yml @@ -85,10 +85,14 @@ stages: - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish Assets - env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet diff --git a/eng/common/templates/post-build/channels/netcore-tools-latest.yml b/eng/common/templates/post-build/channels/netcore-tools-latest.yml index c75d18673396..157d2d4b9772 100644 --- a/eng/common/templates/post-build/channels/netcore-tools-latest.yml +++ b/eng/common/templates/post-build/channels/netcore-tools-latest.yml @@ -85,10 +85,14 @@ stages: - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish Assets - env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet diff --git a/eng/common/templates/post-build/channels/public-validation-release.yml b/eng/common/templates/post-build/channels/netcore-tools-validation.yml similarity index 90% rename from eng/common/templates/post-build/channels/public-validation-release.yml rename to eng/common/templates/post-build/channels/netcore-tools-validation.yml index fb2c23d0f4d8..d8447e49af6f 100644 --- a/eng/common/templates/post-build/channels/public-validation-release.yml +++ b/eng/common/templates/post-build/channels/netcore-tools-validation.yml @@ -21,7 +21,7 @@ stages: value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicValidationRelease_30_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Validation_Channel_Id)) pool: vmImage: 'windows-2019' steps: @@ -50,10 +50,14 @@ stages: - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish Assets - env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet @@ -88,4 +92,4 @@ stages: - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.PublicValidationRelease_30_Channel_Id }} + ChannelId: ${{ variables.NetCore_Tools_Validation_Channel_Id }} diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index adb2a854f206..b4eed6f186c0 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -3,10 +3,6 @@ variables: - group: DotNet-DotNetCli-Storage - group: DotNet-MSRC-Storage - # .NET Core 3 Dev - - name: PublicDevRelease_30_Channel_Id - value: 3 - # .NET Core 3.1 Dev - name: PublicDevRelease_31_Channel_Id value: 128 @@ -16,13 +12,21 @@ variables: value: 131 # .NET Tools - Validation - - name: PublicValidationRelease_30_Channel_Id + - name: NetCore_Tools_Validation_Channel_Id value: 9 # .NET Tools - Latest - name: NetCore_Tools_Latest_Channel_Id value: 2 + # .NET 3 Tools - Validation + - name: NETCore_3_Tools_Validation_Channel_Id + value: 390 + + # .NET 3 Tools - Latest + - name: NetCore_3_Tools_Channel_Id + value: 344 + # .NET Core 3.0 Internal Servicing - name: InternalServicing_30_Channel_Id value: 184 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 5b9d0a5d99bf..7ee82d9ff183 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -101,29 +101,34 @@ stages: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} -- template: \eng\common\templates\post-build\channels\netcore-dev-30.yml +- template: \eng\common\templates\post-build\channels\netcore-dev-31.yml parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} -- template: \eng\common\templates\post-build\channels\netcore-dev-31.yml +- template: \eng\common\templates\post-build\channels\netcore-tools-latest.yml parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} -- template: \eng\common\templates\post-build\channels\netcore-tools-latest.yml +- template: \eng\common\templates\post-build\channels\netcore-tools-validation.yml parameters: - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} -- template: \eng\common\templates\post-build\channels\public-validation-release.yml +- template: \eng\common\templates\post-build\channels\netcore-3-tools-validation.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} +- template: \eng\common\templates\post-build\channels\netcore-3-tools.yml + parameters: + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + - template: \eng\common\templates\post-build\channels\netcore-release-30.yml parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} diff --git a/global.json b/global.json index 5eca702e522c..fa652db0a902 100644 --- a/global.json +++ b/global.json @@ -25,7 +25,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.15.2", - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19462.4", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19462.4" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19474.3", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19474.3" } } From d1c697cf378a5a069b7767f7e5c4db1e7162adfe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 25 Sep 2019 16:26:07 +0000 Subject: [PATCH 002/116] Update dependencies from https://github.com/aspnet/Blazor build 20190925.1 - Microsoft.AspNetCore.Blazor.Mono - 3.0.0-preview9.19475.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2fc13da5099c..73a6233ea7b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ --> - + https://github.com/aspnet/Blazor - 348e050ecd9bd8924581afb677089ae5e2d5e508 + 46318d1a8a1bacf36f6d2c95e960d578d38ad65a https://github.com/aspnet/AspNetCore-Tooling diff --git a/eng/Versions.props b/eng/Versions.props index 8f12ae3ec2f6..9b805c4bd8c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -102,7 +102,7 @@ 3.0.0 - 3.0.0-preview9.19462.2 + 3.0.0-preview9.19475.1 3.0.0-rc2.19463.5 3.0.0-rc2.19463.5 From 79f30a6f55f81a2fbf65b36dbaa4c3198fe3e277 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 25 Sep 2019 20:15:22 +0000 Subject: [PATCH 003/116] Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190925.5 - Microsoft.EntityFrameworkCore.Tools - 3.0.1-servicing.19475.5 - Microsoft.EntityFrameworkCore.SqlServer - 3.0.1-servicing.19475.5 - dotnet-ef - 3.0.1-servicing.19475.5 - Microsoft.EntityFrameworkCore - 3.0.1-servicing.19475.5 - Microsoft.EntityFrameworkCore.InMemory - 3.0.1-servicing.19475.5 - Microsoft.EntityFrameworkCore.Relational - 3.0.1-servicing.19475.5 - Microsoft.EntityFrameworkCore.Sqlite - 3.0.1-servicing.19475.5 --- NuGet.config | 1 - eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index acc24b827fda..bf25290905c4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 73a6233ea7b2..00e979a672d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,33 +29,33 @@ https://github.com/aspnet/AspNetCore-Tooling 16b0ca4a5838c39c8852e6cf144232597e2bee2e - + https://github.com/aspnet/EntityFrameworkCore - b403b17b493cb96059bdc3ef01d184a0213293f2 + 5e56f6ae4a7085c2411dff7c1adb871e1f68fab1 - + https://github.com/aspnet/EntityFrameworkCore - b403b17b493cb96059bdc3ef01d184a0213293f2 + 5e56f6ae4a7085c2411dff7c1adb871e1f68fab1 - + https://github.com/aspnet/EntityFrameworkCore - b403b17b493cb96059bdc3ef01d184a0213293f2 + 5e56f6ae4a7085c2411dff7c1adb871e1f68fab1 - + https://github.com/aspnet/EntityFrameworkCore - b403b17b493cb96059bdc3ef01d184a0213293f2 + 5e56f6ae4a7085c2411dff7c1adb871e1f68fab1 - + https://github.com/aspnet/EntityFrameworkCore - b403b17b493cb96059bdc3ef01d184a0213293f2 + 5e56f6ae4a7085c2411dff7c1adb871e1f68fab1 - + https://github.com/aspnet/EntityFrameworkCore - b403b17b493cb96059bdc3ef01d184a0213293f2 + 5e56f6ae4a7085c2411dff7c1adb871e1f68fab1 - + https://github.com/aspnet/EntityFrameworkCore - b403b17b493cb96059bdc3ef01d184a0213293f2 + 5e56f6ae4a7085c2411dff7c1adb871e1f68fab1 https://github.com/aspnet/Extensions diff --git a/eng/Versions.props b/eng/Versions.props index 9b805c4bd8c0..e503a3cee488 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,13 +166,13 @@ 3.0.0 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 + 3.0.1-servicing.19475.5 + 3.0.1-servicing.19475.5 + 3.0.1-servicing.19475.5 + 3.0.1-servicing.19475.5 + 3.0.1-servicing.19475.5 + 3.0.1-servicing.19475.5 + 3.0.1-servicing.19475.5 3.0.0 3.0.0 From 504e032c686e8e3d122480ab0b950470a37a7904 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 25 Sep 2019 20:20:22 +0000 Subject: [PATCH 004/116] Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190925.6 - Microsoft.NET.Sdk.Razor - 3.0.1-servicing.19475.6 - Microsoft.CodeAnalysis.Razor - 3.0.1-servicing.19475.6 - Microsoft.AspNetCore.Razor.Language - 3.0.1-servicing.19475.6 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.1-servicing.19475.6 --- NuGet.config | 1 - eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index bf25290905c4..2b69c3b77099 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00e979a672d4..24ddb9d1dad7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,21 +13,21 @@ https://github.com/aspnet/Blazor 46318d1a8a1bacf36f6d2c95e960d578d38ad65a - + https://github.com/aspnet/AspNetCore-Tooling - 16b0ca4a5838c39c8852e6cf144232597e2bee2e + 64a81770b89d40fa137d28e0b950d83f10345d1e - + https://github.com/aspnet/AspNetCore-Tooling - 16b0ca4a5838c39c8852e6cf144232597e2bee2e + 64a81770b89d40fa137d28e0b950d83f10345d1e - + https://github.com/aspnet/AspNetCore-Tooling - 16b0ca4a5838c39c8852e6cf144232597e2bee2e + 64a81770b89d40fa137d28e0b950d83f10345d1e - + https://github.com/aspnet/AspNetCore-Tooling - 16b0ca4a5838c39c8852e6cf144232597e2bee2e + 64a81770b89d40fa137d28e0b950d83f10345d1e https://github.com/aspnet/EntityFrameworkCore diff --git a/eng/Versions.props b/eng/Versions.props index e503a3cee488..ad9ff35ad771 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -174,10 +174,10 @@ 3.0.1-servicing.19475.5 3.0.1-servicing.19475.5 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 + 3.0.1-servicing.19475.6 + 3.0.1-servicing.19475.6 + 3.0.1-servicing.19475.6 + 3.0.1-servicing.19475.6 + From 14287d1dd7e1b28c3b3dd4883ecac53692449c3f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 26 Sep 2019 02:45:21 +0000 Subject: [PATCH 006/116] Update dependencies from https://github.com/aspnet/Blazor build 20190925.4 - Microsoft.AspNetCore.Blazor.Mono - 3.0.0-preview9.19475.4 --- NuGet.config | 2 +- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 44a8bea1b05c..9a1186746aad 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,12 +1,12 @@ + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24ddb9d1dad7..f3a16e468d02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ --> - + https://github.com/aspnet/Blazor - 46318d1a8a1bacf36f6d2c95e960d578d38ad65a + c606594a0e5ebc36636d36e418ee0e189ce7a012 https://github.com/aspnet/AspNetCore-Tooling diff --git a/eng/Versions.props b/eng/Versions.props index ad9ff35ad771..6dc7f651904b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -102,7 +102,7 @@ 3.0.0 - 3.0.0-preview9.19475.1 + 3.0.0-preview9.19475.4 3.0.0-rc2.19463.5 3.0.0-rc2.19463.5 From 08453d26dd65a3b372a3b8299793ff1a49642345 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 26 Sep 2019 09:02:19 -0700 Subject: [PATCH 007/116] Remove potentially unnecessary feeds --- NuGet.config | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9a1186746aad..ac1cb75c42c2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,22 +2,11 @@ - - - - - - - - - + + - - - - From f3df5cb57136ae21fa04e445b1b7f6081d321ee1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 26 Sep 2019 17:50:24 +0000 Subject: [PATCH 008/116] Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190926.1 - Microsoft.EntityFrameworkCore.Tools - 3.0.1-servicing.19476.1 - Microsoft.EntityFrameworkCore.SqlServer - 3.0.1-servicing.19476.1 - dotnet-ef - 3.0.1-servicing.19476.1 - Microsoft.EntityFrameworkCore - 3.0.1-servicing.19476.1 - Microsoft.EntityFrameworkCore.InMemory - 3.0.1-servicing.19476.1 - Microsoft.EntityFrameworkCore.Relational - 3.0.1-servicing.19476.1 - Microsoft.EntityFrameworkCore.Sqlite - 3.0.1-servicing.19476.1 --- NuGet.config | 5 +++++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 3 files changed, 26 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index ac1cb75c42c2..330604b32662 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,6 +2,11 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3a16e468d02..eb9616afd6ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,33 +29,33 @@ https://github.com/aspnet/AspNetCore-Tooling 64a81770b89d40fa137d28e0b950d83f10345d1e - + https://github.com/aspnet/EntityFrameworkCore - 5e56f6ae4a7085c2411dff7c1adb871e1f68fab1 + be88463c6bb983498583283dbb1a563dc7034105 - + https://github.com/aspnet/EntityFrameworkCore - 5e56f6ae4a7085c2411dff7c1adb871e1f68fab1 + be88463c6bb983498583283dbb1a563dc7034105 - + https://github.com/aspnet/EntityFrameworkCore - 5e56f6ae4a7085c2411dff7c1adb871e1f68fab1 + be88463c6bb983498583283dbb1a563dc7034105 - + https://github.com/aspnet/EntityFrameworkCore - 5e56f6ae4a7085c2411dff7c1adb871e1f68fab1 + be88463c6bb983498583283dbb1a563dc7034105 - + https://github.com/aspnet/EntityFrameworkCore - 5e56f6ae4a7085c2411dff7c1adb871e1f68fab1 + be88463c6bb983498583283dbb1a563dc7034105 - + https://github.com/aspnet/EntityFrameworkCore - 5e56f6ae4a7085c2411dff7c1adb871e1f68fab1 + be88463c6bb983498583283dbb1a563dc7034105 - + https://github.com/aspnet/EntityFrameworkCore - 5e56f6ae4a7085c2411dff7c1adb871e1f68fab1 + be88463c6bb983498583283dbb1a563dc7034105 https://github.com/aspnet/Extensions diff --git a/eng/Versions.props b/eng/Versions.props index 6dc7f651904b..ff13fd15cdbf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,13 +166,13 @@ 3.0.0 3.0.0 - 3.0.1-servicing.19475.5 - 3.0.1-servicing.19475.5 - 3.0.1-servicing.19475.5 - 3.0.1-servicing.19475.5 - 3.0.1-servicing.19475.5 - 3.0.1-servicing.19475.5 - 3.0.1-servicing.19475.5 + 3.0.1-servicing.19476.1 + 3.0.1-servicing.19476.1 + 3.0.1-servicing.19476.1 + 3.0.1-servicing.19476.1 + 3.0.1-servicing.19476.1 + 3.0.1-servicing.19476.1 + 3.0.1-servicing.19476.1 3.0.1-servicing.19475.6 3.0.1-servicing.19475.6 From 25eff27e948c846b6b81c11017a4f97c7d37c9c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 3 Oct 2019 17:05:19 +0000 Subject: [PATCH 009/116] Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191003.6 - Microsoft.NET.Sdk.Razor - 3.0.1-servicing.19503.6 - Microsoft.CodeAnalysis.Razor - 3.0.1-servicing.19503.6 - Microsoft.AspNetCore.Razor.Language - 3.0.1-servicing.19503.6 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.1-servicing.19503.6 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 15 ++++++--------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb9616afd6ee..9c8f3cb8cc20 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,21 +13,21 @@ https://github.com/aspnet/Blazor c606594a0e5ebc36636d36e418ee0e189ce7a012 - + https://github.com/aspnet/AspNetCore-Tooling - 64a81770b89d40fa137d28e0b950d83f10345d1e + fa3adaa2dd1c72ffb1a894374b7e3d7da9b58c0e - + https://github.com/aspnet/AspNetCore-Tooling - 64a81770b89d40fa137d28e0b950d83f10345d1e + fa3adaa2dd1c72ffb1a894374b7e3d7da9b58c0e - + https://github.com/aspnet/AspNetCore-Tooling - 64a81770b89d40fa137d28e0b950d83f10345d1e + fa3adaa2dd1c72ffb1a894374b7e3d7da9b58c0e - + https://github.com/aspnet/AspNetCore-Tooling - 64a81770b89d40fa137d28e0b950d83f10345d1e + fa3adaa2dd1c72ffb1a894374b7e3d7da9b58c0e https://github.com/aspnet/EntityFrameworkCore diff --git a/eng/Versions.props b/eng/Versions.props index ff13fd15cdbf..210c79b5ae11 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,6 @@ 3 0 1 - @@ -30,11 +29,9 @@ Until package baselines are updated (see aspnet/AspNetCore#12702), ignore them and PatchConfig.props. This also gives us time to build the entire repo and settle the infrastructure. Do _not_ do this when stabilizing versions. --> - true + true - true + true $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion) $(VersionPrefix) @@ -174,10 +171,10 @@ 3.0.1-servicing.19476.1 3.0.1-servicing.19476.1 - 3.0.1-servicing.19475.6 - 3.0.1-servicing.19475.6 - 3.0.1-servicing.19475.6 - 3.0.1-servicing.19475.6 + 3.0.1-servicing.19503.6 + 3.0.1-servicing.19503.6 + 3.0.1-servicing.19503.6 + 3.0.1-servicing.19503.6 - + https://github.com/aspnet/Blazor c606594a0e5ebc36636d36e418ee0e189ce7a012 diff --git a/eng/Versions.props b/eng/Versions.props index 210c79b5ae11..932672b3f3e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -99,7 +99,7 @@ 3.0.0 - 3.0.0-preview9.19475.4 + 3.0.0-preview9.19503.2 3.0.0-rc2.19463.5 3.0.0-rc2.19463.5 From 918ddede3a2fe55c78676e639ccf9cd517b97599 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 4 Oct 2019 16:53:05 -0700 Subject: [PATCH 011/116] Install the runtime during source build --- eng/scripts/ci-source-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/scripts/ci-source-build.sh b/eng/scripts/ci-source-build.sh index 8b4c801d3af7..ebc50dad0a59 100755 --- a/eng/scripts/ci-source-build.sh +++ b/eng/scripts/ci-source-build.sh @@ -30,10 +30,10 @@ trap "{ mv "$reporoot/global.bak.json" "$reporoot/global.json" }" EXIT -export DotNetBuildFromSource='true' - # Build repo tasks "$reporoot/eng/common/build.sh" --restore --build --ci --configuration Release /p:ProjectToBuild=$reporoot/eng/tools/RepoTasks/RepoTasks.csproj +export DotNetBuildFromSource='true' + # Build projects "$reporoot/eng/common/build.sh" --restore --build --pack "$@" \ No newline at end of file From 7e57dedea0aeb9738599f5456ea36842c7fb87a0 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 4 Oct 2019 16:54:00 -0700 Subject: [PATCH 012/116] Pin m.nc.app.ref --- eng/Version.Details.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b75c316a02b..261f28d5f39f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -385,10 +385,6 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 - + + https://github.com/dotnet/core-setup + 7d57652f33493fa022125b7f63aad0d70c52d810 + From 8fbd355e4c638ac6cb93f14e3fdad65ddd78aa3d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Oct 2019 14:30:32 +0000 Subject: [PATCH 013/116] Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191007.2 - Microsoft.NET.Sdk.Razor - 3.0.1-servicing.19507.2 - Microsoft.CodeAnalysis.Razor - 3.0.1-servicing.19507.2 - Microsoft.AspNetCore.Razor.Language - 3.0.1-servicing.19507.2 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.1-servicing.19507.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 261f28d5f39f..a888d27742c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,21 +13,21 @@ https://github.com/aspnet/Blazor c606594a0e5ebc36636d36e418ee0e189ce7a012 - + https://github.com/aspnet/AspNetCore-Tooling - fa3adaa2dd1c72ffb1a894374b7e3d7da9b58c0e + ae9d989c74c6f4850df8b612f4a91da87448a181 - + https://github.com/aspnet/AspNetCore-Tooling - fa3adaa2dd1c72ffb1a894374b7e3d7da9b58c0e + ae9d989c74c6f4850df8b612f4a91da87448a181 - + https://github.com/aspnet/AspNetCore-Tooling - fa3adaa2dd1c72ffb1a894374b7e3d7da9b58c0e + ae9d989c74c6f4850df8b612f4a91da87448a181 - + https://github.com/aspnet/AspNetCore-Tooling - fa3adaa2dd1c72ffb1a894374b7e3d7da9b58c0e + ae9d989c74c6f4850df8b612f4a91da87448a181 https://github.com/aspnet/EntityFrameworkCore diff --git a/eng/Versions.props b/eng/Versions.props index 932672b3f3e6..ccd16504792c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -171,10 +171,10 @@ 3.0.1-servicing.19476.1 3.0.1-servicing.19476.1 - 3.0.1-servicing.19503.6 - 3.0.1-servicing.19503.6 - 3.0.1-servicing.19503.6 - 3.0.1-servicing.19503.6 + 3.0.1-servicing.19507.2 + 3.0.1-servicing.19507.2 + 3.0.1-servicing.19507.2 + 3.0.1-servicing.19507.2 - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a0e7b41e8d0..aace4260be5c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,269 +29,269 @@ https://github.com/aspnet/AspNetCore-Tooling ae9d989c74c6f4850df8b612f4a91da87448a181 - + https://github.com/aspnet/EntityFrameworkCore - be88463c6bb983498583283dbb1a563dc7034105 + 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 - + https://github.com/aspnet/EntityFrameworkCore - be88463c6bb983498583283dbb1a563dc7034105 + 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 - + https://github.com/aspnet/EntityFrameworkCore - be88463c6bb983498583283dbb1a563dc7034105 + 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 - + https://github.com/aspnet/EntityFrameworkCore - be88463c6bb983498583283dbb1a563dc7034105 + 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 - + https://github.com/aspnet/EntityFrameworkCore - be88463c6bb983498583283dbb1a563dc7034105 + 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 - + https://github.com/aspnet/EntityFrameworkCore - be88463c6bb983498583283dbb1a563dc7034105 + 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 - + https://github.com/aspnet/EntityFrameworkCore - be88463c6bb983498583283dbb1a563dc7034105 + 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 https://github.com/aspnet/Extensions 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 https://github.com/dotnet/corefx @@ -381,21 +381,21 @@ https://github.com/dotnet/corefx 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea - + https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 + f8bfa4242fb299c1d1a635c069dbfec7870a023b - + https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 + f8bfa4242fb299c1d1a635c069dbfec7870a023b https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 + f8bfa4242fb299c1d1a635c069dbfec7870a023b @@ -409,9 +409,9 @@ https://github.com/dotnet/corefx 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 https://github.com/dotnet/arcade @@ -425,9 +425,9 @@ https://github.com/dotnet/arcade 0e9ffd6464aff37aef2dc41dc2162d258f266e32 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index ccd16504792c..ca1a155e9374 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ 3.3.1-beta4-19462-11 - 3.0.0 + 3.0.1 3.0.0 - 3.0.0 + 3.0.1 2.1.0 1.0.0 @@ -101,75 +101,75 @@ 3.0.0-preview9.19503.2 - 3.0.0-rc2.19463.5 - 3.0.0-rc2.19463.5 - 3.0.0-rc2.19463.5 - 3.0.0-rc2.19463.5 - 3.0.0-rc2.19463.5 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0-rc2.19463.5 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0-rc2.19463.5 - 3.0.0 - 3.0.0 - 3.0.0-rc2.19463.5 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0-rc2.19463.5 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0-rc2.19463.5 - 3.0.0 - 3.0.0-rc2.19463.5 - 3.0.0-rc2.19463.5 - 3.0.0 + 3.0.1-servicing.19506.5 + 3.0.1-servicing.19506.5 + 3.0.1-servicing.19506.5 + 3.0.1-servicing.19506.5 + 3.0.1-servicing.19506.5 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1-servicing.19506.5 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1-servicing.19506.5 + 3.0.1 + 3.0.1 + 3.0.1-servicing.19506.5 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1-servicing.19506.5 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1-servicing.19506.5 + 3.0.1 + 3.0.1-servicing.19506.5 + 3.0.1-servicing.19506.5 + 3.0.1 3.0.0-rc2.19463.5 - 3.0.0 - 3.0.0 + 3.0.1 + 3.0.1 - 3.0.1-servicing.19476.1 - 3.0.1-servicing.19476.1 - 3.0.1-servicing.19476.1 - 3.0.1-servicing.19476.1 - 3.0.1-servicing.19476.1 - 3.0.1-servicing.19476.1 - 3.0.1-servicing.19476.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 3.0.1-servicing.19507.2 3.0.1-servicing.19507.2 From 77e95762b3524c5fbad3da57db26c819c27c0df1 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 7 Oct 2019 20:09:27 -0700 Subject: [PATCH 017/116] Revert "Update dependencies" This reverts commit 5618de6dbb335d3946e2a01fbfc259ef5592603f. --- NuGet.config | 5 + eng/Version.Details.xml | 278 ++++++++++++++++++++-------------------- eng/Versions.props | 138 ++++++++++---------- 3 files changed, 213 insertions(+), 208 deletions(-) diff --git a/NuGet.config b/NuGet.config index bbd0fb2178f8..bdabcde5141d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,6 +2,11 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aace4260be5c..9a0e7b41e8d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,269 +29,269 @@ https://github.com/aspnet/AspNetCore-Tooling ae9d989c74c6f4850df8b612f4a91da87448a181 - + https://github.com/aspnet/EntityFrameworkCore - 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 + be88463c6bb983498583283dbb1a563dc7034105 - + https://github.com/aspnet/EntityFrameworkCore - 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 + be88463c6bb983498583283dbb1a563dc7034105 - + https://github.com/aspnet/EntityFrameworkCore - 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 + be88463c6bb983498583283dbb1a563dc7034105 - + https://github.com/aspnet/EntityFrameworkCore - 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 + be88463c6bb983498583283dbb1a563dc7034105 - + https://github.com/aspnet/EntityFrameworkCore - 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 + be88463c6bb983498583283dbb1a563dc7034105 - + https://github.com/aspnet/EntityFrameworkCore - 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 + be88463c6bb983498583283dbb1a563dc7034105 - + https://github.com/aspnet/EntityFrameworkCore - 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 + be88463c6bb983498583283dbb1a563dc7034105 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 https://github.com/aspnet/Extensions 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 https://github.com/dotnet/corefx @@ -381,21 +381,21 @@ https://github.com/dotnet/corefx 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea - + https://github.com/dotnet/core-setup - f8bfa4242fb299c1d1a635c069dbfec7870a023b + 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - f8bfa4242fb299c1d1a635c069dbfec7870a023b + 7d57652f33493fa022125b7f63aad0d70c52d810 https://github.com/dotnet/core-setup - f8bfa4242fb299c1d1a635c069dbfec7870a023b + 7d57652f33493fa022125b7f63aad0d70c52d810 @@ -409,9 +409,9 @@ https://github.com/dotnet/corefx 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 https://github.com/dotnet/arcade @@ -425,9 +425,9 @@ https://github.com/dotnet/arcade 0e9ffd6464aff37aef2dc41dc2162d258f266e32 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 0b951c16de0f39e13cce8372e11c28eb90576662 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index ca1a155e9374..ccd16504792c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ 3.3.1-beta4-19462-11 - 3.0.1 + 3.0.0 3.0.0 - 3.0.1 + 3.0.0 2.1.0 1.0.0 @@ -101,75 +101,75 @@ 3.0.0-preview9.19503.2 - 3.0.1-servicing.19506.5 - 3.0.1-servicing.19506.5 - 3.0.1-servicing.19506.5 - 3.0.1-servicing.19506.5 - 3.0.1-servicing.19506.5 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1-servicing.19506.5 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1-servicing.19506.5 - 3.0.1 - 3.0.1 - 3.0.1-servicing.19506.5 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1-servicing.19506.5 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1-servicing.19506.5 - 3.0.1 - 3.0.1-servicing.19506.5 - 3.0.1-servicing.19506.5 - 3.0.1 + 3.0.0-rc2.19463.5 + 3.0.0-rc2.19463.5 + 3.0.0-rc2.19463.5 + 3.0.0-rc2.19463.5 + 3.0.0-rc2.19463.5 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0-rc2.19463.5 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0-rc2.19463.5 + 3.0.0 + 3.0.0 + 3.0.0-rc2.19463.5 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0-rc2.19463.5 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0-rc2.19463.5 + 3.0.0 + 3.0.0-rc2.19463.5 + 3.0.0-rc2.19463.5 + 3.0.0 3.0.0-rc2.19463.5 - 3.0.1 - 3.0.1 + 3.0.0 + 3.0.0 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 + 3.0.1-servicing.19476.1 + 3.0.1-servicing.19476.1 + 3.0.1-servicing.19476.1 + 3.0.1-servicing.19476.1 + 3.0.1-servicing.19476.1 + 3.0.1-servicing.19476.1 + 3.0.1-servicing.19476.1 3.0.1-servicing.19507.2 3.0.1-servicing.19507.2 From 2f3eed287405e9087cfaeab4aea1b230555c0542 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Oct 2019 03:10:21 +0000 Subject: [PATCH 018/116] Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191007.5 - Microsoft.NET.Sdk.Razor - 3.0.1 - Microsoft.CodeAnalysis.Razor - 3.0.1 - Microsoft.AspNetCore.Razor.Language - 3.0.1 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.1 --- NuGet.config | 1 + eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index bdabcde5141d..6ec72f44dbdb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a0e7b41e8d0..3051f0be346b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,21 +13,21 @@ https://github.com/aspnet/Blazor c606594a0e5ebc36636d36e418ee0e189ce7a012 - + https://github.com/aspnet/AspNetCore-Tooling - ae9d989c74c6f4850df8b612f4a91da87448a181 + 664e13ff751d89d199e79af2c3477b5f18bec9fc - + https://github.com/aspnet/AspNetCore-Tooling - ae9d989c74c6f4850df8b612f4a91da87448a181 + 664e13ff751d89d199e79af2c3477b5f18bec9fc - + https://github.com/aspnet/AspNetCore-Tooling - ae9d989c74c6f4850df8b612f4a91da87448a181 + 664e13ff751d89d199e79af2c3477b5f18bec9fc - + https://github.com/aspnet/AspNetCore-Tooling - ae9d989c74c6f4850df8b612f4a91da87448a181 + 664e13ff751d89d199e79af2c3477b5f18bec9fc https://github.com/aspnet/EntityFrameworkCore diff --git a/eng/Versions.props b/eng/Versions.props index ccd16504792c..593f24a23aea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -171,10 +171,10 @@ 3.0.1-servicing.19476.1 3.0.1-servicing.19476.1 - 3.0.1-servicing.19507.2 - 3.0.1-servicing.19507.2 - 3.0.1-servicing.19507.2 - 3.0.1-servicing.19507.2 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3051f0be346b..e6b7822a0f9e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,269 +29,269 @@ https://github.com/aspnet/AspNetCore-Tooling 664e13ff751d89d199e79af2c3477b5f18bec9fc - + https://github.com/aspnet/EntityFrameworkCore - be88463c6bb983498583283dbb1a563dc7034105 + 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 - + https://github.com/aspnet/EntityFrameworkCore - be88463c6bb983498583283dbb1a563dc7034105 + 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 - + https://github.com/aspnet/EntityFrameworkCore - be88463c6bb983498583283dbb1a563dc7034105 + 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 - + https://github.com/aspnet/EntityFrameworkCore - be88463c6bb983498583283dbb1a563dc7034105 + 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 - + https://github.com/aspnet/EntityFrameworkCore - be88463c6bb983498583283dbb1a563dc7034105 + 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 - + https://github.com/aspnet/EntityFrameworkCore - be88463c6bb983498583283dbb1a563dc7034105 + 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 - + https://github.com/aspnet/EntityFrameworkCore - be88463c6bb983498583283dbb1a563dc7034105 + 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 https://github.com/aspnet/Extensions 0b951c16de0f39e13cce8372e11c28eb90576662 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 https://github.com/dotnet/corefx @@ -381,21 +381,21 @@ https://github.com/dotnet/corefx 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea - + https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 + f8bfa4242fb299c1d1a635c069dbfec7870a023b - + https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 + f8bfa4242fb299c1d1a635c069dbfec7870a023b https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 + f8bfa4242fb299c1d1a635c069dbfec7870a023b @@ -409,9 +409,9 @@ https://github.com/dotnet/corefx 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 https://github.com/dotnet/arcade @@ -425,9 +425,9 @@ https://github.com/dotnet/arcade 0e9ffd6464aff37aef2dc41dc2162d258f266e32 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 0e82b48369290d71f976d96f8880ed24a710a0b2 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 593f24a23aea..3e236a6f4f84 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ 3.3.1-beta4-19462-11 - 3.0.0 + 3.0.1 3.0.0 - 3.0.0 + 3.0.1 2.1.0 1.0.0 @@ -101,75 +101,75 @@ 3.0.0-preview9.19503.2 - 3.0.0-rc2.19463.5 - 3.0.0-rc2.19463.5 - 3.0.0-rc2.19463.5 - 3.0.0-rc2.19463.5 - 3.0.0-rc2.19463.5 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0-rc2.19463.5 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0-rc2.19463.5 - 3.0.0 - 3.0.0 - 3.0.0-rc2.19463.5 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0-rc2.19463.5 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0-rc2.19463.5 - 3.0.0 - 3.0.0-rc2.19463.5 - 3.0.0-rc2.19463.5 - 3.0.0 + 3.0.1-servicing.19506.5 + 3.0.1-servicing.19506.5 + 3.0.1-servicing.19506.5 + 3.0.1-servicing.19506.5 + 3.0.1-servicing.19506.5 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1-servicing.19506.5 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1-servicing.19506.5 + 3.0.1 + 3.0.1 + 3.0.1-servicing.19506.5 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1-servicing.19506.5 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1-servicing.19506.5 + 3.0.1 + 3.0.1-servicing.19506.5 + 3.0.1-servicing.19506.5 + 3.0.1 3.0.0-rc2.19463.5 - 3.0.0 - 3.0.0 + 3.0.1 + 3.0.1 - 3.0.1-servicing.19476.1 - 3.0.1-servicing.19476.1 - 3.0.1-servicing.19476.1 - 3.0.1-servicing.19476.1 - 3.0.1-servicing.19476.1 - 3.0.1-servicing.19476.1 - 3.0.1-servicing.19476.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 3.0.1 3.0.1 From 701a08067e545322349c7e7f3665447261d98828 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 7 Oct 2019 20:38:08 -0700 Subject: [PATCH 020/116] Move efcore internal refs dependency --- eng/Version.Details.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e6b7822a0f9e..406a22f82462 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -281,10 +281,6 @@ https://github.com/aspnet/Extensions 0e82b48369290d71f976d96f8880ed24a710a0b2 - - https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 - https://github.com/aspnet/Extensions 0e82b48369290d71f976d96f8880ed24a710a0b2 @@ -402,6 +398,10 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 + + https://github.com/aspnet/Extensions + 0b951c16de0f39e13cce8372e11c28eb90576662 + From 78e09e30c4cce337fc9ab85f3648a38948e0bdae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Oct 2019 04:38:49 +0000 Subject: [PATCH 021/116] Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191007.5 - Microsoft.NET.Sdk.Razor - 3.0.1 - Microsoft.CodeAnalysis.Razor - 3.0.1 - Microsoft.AspNetCore.Razor.Language - 3.0.1 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.1 --- NuGet.config | 6 ++++-- eng/Versions.props | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index b5bd6f85b78f..b5eafd49c976 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,11 @@ - + + + + - diff --git a/eng/Versions.props b/eng/Versions.props index 3e236a6f4f84..efd73bb84cc4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -14,7 +14,6 @@ --> false release - true false servicing From f54c60728ee223f2e79adc1ca862214366d20d52 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Oct 2019 04:35:30 +0000 Subject: [PATCH 022/116] Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191010.7 - Microsoft.NET.Sdk.Razor - 3.0.1 - Microsoft.CodeAnalysis.Razor - 3.0.1 - Microsoft.AspNetCore.Razor.Language - 3.0.1 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.1 --- NuGet.config | 2 +- eng/Version.Details.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index b5eafd49c976..2299de20c4ac 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 406a22f82462..33fb2e03b3a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,19 +15,19 @@ https://github.com/aspnet/AspNetCore-Tooling - 664e13ff751d89d199e79af2c3477b5f18bec9fc + 4351c6e4606a55608f187a0aab86a83c152f7878 https://github.com/aspnet/AspNetCore-Tooling - 664e13ff751d89d199e79af2c3477b5f18bec9fc + 4351c6e4606a55608f187a0aab86a83c152f7878 https://github.com/aspnet/AspNetCore-Tooling - 664e13ff751d89d199e79af2c3477b5f18bec9fc + 4351c6e4606a55608f187a0aab86a83c152f7878 https://github.com/aspnet/AspNetCore-Tooling - 664e13ff751d89d199e79af2c3477b5f18bec9fc + 4351c6e4606a55608f187a0aab86a83c152f7878 https://github.com/aspnet/EntityFrameworkCore From 5556737cef52b9799d176a0cfe00a719a228c416 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 12 Oct 2019 15:11:05 +0000 Subject: [PATCH 023/116] Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191011.3 - Microsoft.NET.Sdk.Razor - 3.0.1 - Microsoft.CodeAnalysis.Razor - 3.0.1 - Microsoft.AspNetCore.Razor.Language - 3.0.1 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.1 --- NuGet.config | 2 +- eng/Version.Details.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2299de20c4ac..62613eda6d36 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 33fb2e03b3a0..87e48f164d4f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,19 +15,19 @@ https://github.com/aspnet/AspNetCore-Tooling - 4351c6e4606a55608f187a0aab86a83c152f7878 + 90395b97dad27649367ddc3698e410e783e58e8d https://github.com/aspnet/AspNetCore-Tooling - 4351c6e4606a55608f187a0aab86a83c152f7878 + 90395b97dad27649367ddc3698e410e783e58e8d https://github.com/aspnet/AspNetCore-Tooling - 4351c6e4606a55608f187a0aab86a83c152f7878 + 90395b97dad27649367ddc3698e410e783e58e8d https://github.com/aspnet/AspNetCore-Tooling - 4351c6e4606a55608f187a0aab86a83c152f7878 + 90395b97dad27649367ddc3698e410e783e58e8d https://github.com/aspnet/EntityFrameworkCore From ad5989671e68b814a7e42e8b8b076b95bc1d1357 Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 9 Oct 2019 19:23:39 -0700 Subject: [PATCH 024/116] Compile against ref assemblies --- Directory.Build.targets | 3 +-- eng/targets/ResolveReferences.targets | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index db3cea59f118..074b8c1c38d6 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -105,9 +105,8 @@ - + - $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0.0 diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index 4efbe58e9769..ddac8181b02d 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -50,10 +50,10 @@ true false - true + true false - true + true false From b08b5e4eaa6996a440c12d7c2ed010181649ab15 Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 9 Oct 2019 22:23:13 -0700 Subject: [PATCH 025/116] typo --- eng/targets/ResolveReferences.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index ddac8181b02d..a23637fed734 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -50,10 +50,10 @@ true false - true + true false - true + true false From 72d3d93b2e3d3edd5d149f935c7662684ec760a3 Mon Sep 17 00:00:00 2001 From: John Luo Date: Thu, 10 Oct 2019 15:11:17 -0700 Subject: [PATCH 026/116] Add manually generated DataProtection internal ref assembly --- ...AspNetCore.Cryptography.Internal.Manual.cs | 422 ++++++++++++++++++ ...ft.AspNetCore.Cryptography.Internal.csproj | 5 +- ...ore.DataProtection.Extensions.Tests.csproj | 1 + 3 files changed, 427 insertions(+), 1 deletion(-) create mode 100644 src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.Manual.cs diff --git a/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.Manual.cs b/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.Manual.cs new file mode 100644 index 000000000000..6f9ef2dd9de9 --- /dev/null +++ b/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.Manual.cs @@ -0,0 +1,422 @@ +// 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.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Cryptography.Internal.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Cryptography.KeyDerivation, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Cryptography.KeyDerivation.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.DataProtection, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.DataProtection.Abstractions.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.DataProtection.Extensions.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.DataProtection.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] + +namespace Microsoft.AspNetCore.Cryptography +{ + internal static partial class Constants + { + internal const string BCRYPT_3DES_112_ALGORITHM = "3DES_112"; + internal const string BCRYPT_3DES_ALGORITHM = "3DES"; + internal const string BCRYPT_AES_ALGORITHM = "AES"; + internal const string BCRYPT_AES_CMAC_ALGORITHM = "AES-CMAC"; + internal const string BCRYPT_AES_GMAC_ALGORITHM = "AES-GMAC"; + internal const string BCRYPT_AES_WRAP_KEY_BLOB = "Rfc3565KeyWrapBlob"; + internal const string BCRYPT_ALGORITHM_NAME = "AlgorithmName"; + internal const string BCRYPT_AUTH_TAG_LENGTH = "AuthTagLength"; + internal const string BCRYPT_BLOCK_LENGTH = "BlockLength"; + internal const string BCRYPT_BLOCK_SIZE_LIST = "BlockSizeList"; + internal const string BCRYPT_CAPI_KDF_ALGORITHM = "CAPI_KDF"; + internal const string BCRYPT_CHAINING_MODE = "ChainingMode"; + internal const string BCRYPT_CHAIN_MODE_CBC = "ChainingModeCBC"; + internal const string BCRYPT_CHAIN_MODE_CCM = "ChainingModeCCM"; + internal const string BCRYPT_CHAIN_MODE_CFB = "ChainingModeCFB"; + internal const string BCRYPT_CHAIN_MODE_ECB = "ChainingModeECB"; + internal const string BCRYPT_CHAIN_MODE_GCM = "ChainingModeGCM"; + internal const string BCRYPT_CHAIN_MODE_NA = "ChainingModeN/A"; + internal const string BCRYPT_DESX_ALGORITHM = "DESX"; + internal const string BCRYPT_DES_ALGORITHM = "DES"; + internal const string BCRYPT_DH_ALGORITHM = "DH"; + internal const string BCRYPT_DSA_ALGORITHM = "DSA"; + internal const string BCRYPT_ECDH_P256_ALGORITHM = "ECDH_P256"; + internal const string BCRYPT_ECDH_P384_ALGORITHM = "ECDH_P384"; + internal const string BCRYPT_ECDH_P521_ALGORITHM = "ECDH_P521"; + internal const string BCRYPT_ECDSA_P256_ALGORITHM = "ECDSA_P256"; + internal const string BCRYPT_ECDSA_P384_ALGORITHM = "ECDSA_P384"; + internal const string BCRYPT_ECDSA_P521_ALGORITHM = "ECDSA_P521"; + internal const string BCRYPT_EFFECTIVE_KEY_LENGTH = "EffectiveKeyLength"; + internal const string BCRYPT_HASH_BLOCK_LENGTH = "HashBlockLength"; + internal const string BCRYPT_HASH_LENGTH = "HashDigestLength"; + internal const string BCRYPT_HASH_OID_LIST = "HashOIDList"; + internal const string BCRYPT_IS_KEYED_HASH = "IsKeyedHash"; + internal const string BCRYPT_IS_REUSABLE_HASH = "IsReusableHash"; + internal const string BCRYPT_KEY_DATA_BLOB = "KeyDataBlob"; + internal const string BCRYPT_KEY_LENGTH = "KeyLength"; + internal const string BCRYPT_KEY_LENGTHS = "KeyLengths"; + internal const string BCRYPT_KEY_OBJECT_LENGTH = "KeyObjectLength"; + internal const string BCRYPT_KEY_STRENGTH = "KeyStrength"; + internal const string BCRYPT_MD2_ALGORITHM = "MD2"; + internal const string BCRYPT_MD4_ALGORITHM = "MD4"; + internal const string BCRYPT_MD5_ALGORITHM = "MD5"; + internal const string BCRYPT_MESSAGE_BLOCK_LENGTH = "MessageBlockLength"; + internal const string BCRYPT_OBJECT_LENGTH = "ObjectLength"; + internal const string BCRYPT_OPAQUE_KEY_BLOB = "OpaqueKeyBlob"; + internal const string BCRYPT_PADDING_SCHEMES = "PaddingSchemes"; + internal const string BCRYPT_PBKDF2_ALGORITHM = "PBKDF2"; + internal const string BCRYPT_PRIMITIVE_TYPE = "PrimitiveType"; + internal const string BCRYPT_PROVIDER_HANDLE = "ProviderHandle"; + internal const string BCRYPT_RC2_ALGORITHM = "RC2"; + internal const string BCRYPT_RC4_ALGORITHM = "RC4"; + internal const string BCRYPT_RNG_ALGORITHM = "RNG"; + internal const string BCRYPT_RNG_DUAL_EC_ALGORITHM = "DUALECRNG"; + internal const string BCRYPT_RNG_FIPS186_DSA_ALGORITHM = "FIPS186DSARNG"; + internal const string BCRYPT_RSA_ALGORITHM = "RSA"; + internal const string BCRYPT_RSA_SIGN_ALGORITHM = "RSA_SIGN"; + internal const string BCRYPT_SHA1_ALGORITHM = "SHA1"; + internal const string BCRYPT_SHA256_ALGORITHM = "SHA256"; + internal const string BCRYPT_SHA384_ALGORITHM = "SHA384"; + internal const string BCRYPT_SHA512_ALGORITHM = "SHA512"; + internal const string BCRYPT_SIGNATURE_LENGTH = "SignatureLength"; + internal const string BCRYPT_SP800108_CTR_HMAC_ALGORITHM = "SP800_108_CTR_HMAC"; + internal const string BCRYPT_SP80056A_CONCAT_ALGORITHM = "SP800_56A_CONCAT"; + internal const int MAX_STACKALLOC_BYTES = 256; + internal const string MS_PLATFORM_CRYPTO_PROVIDER = "Microsoft Platform Crypto Provider"; + internal const string MS_PRIMITIVE_PROVIDER = "Microsoft Primitive Provider"; + } + internal static partial class CryptoUtil + { + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static void Assert(bool condition, string message) { } + public static void AssertPlatformIsWindows() { } + public static void AssertPlatformIsWindows8OrLater() { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static void AssertSafeHandleIsValid(System.Runtime.InteropServices.SafeHandle safeHandle) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]public static System.Exception Fail(string message) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]public static T Fail(string message) where T : class { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining | System.Runtime.CompilerServices.MethodImplOptions.NoOptimization)][System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.Success)] + public unsafe static bool TimeConstantBuffersAreEqual(byte* bufA, byte* bufB, uint count) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining | System.Runtime.CompilerServices.MethodImplOptions.NoOptimization)]public static bool TimeConstantBuffersAreEqual(byte[] bufA, int offsetA, int countA, byte[] bufB, int offsetB, int countB) { throw null; } + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal unsafe partial struct DATA_BLOB + { + public uint cbData; + public byte* pbData; + } + internal static partial class UnsafeBufferUtil + { + [System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.MayFail)] + public static void BlockCopy(Microsoft.AspNetCore.Cryptography.SafeHandles.LocalAllocHandle from, Microsoft.AspNetCore.Cryptography.SafeHandles.LocalAllocHandle to, System.IntPtr length) { } + [System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.MayFail)] + public unsafe static void BlockCopy(Microsoft.AspNetCore.Cryptography.SafeHandles.LocalAllocHandle from, void* to, uint byteCount) { } + [System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.MayFail)] + public unsafe static void BlockCopy(void* from, Microsoft.AspNetCore.Cryptography.SafeHandles.LocalAllocHandle to, uint byteCount) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)][System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.Success)] + public unsafe static void BlockCopy(void* from, void* to, int byteCount) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)][System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.Success)] + public unsafe static void BlockCopy(void* from, void* to, uint byteCount) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]private unsafe static void BlockCopyCore(byte* from, byte* to, uint byteCount) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]private unsafe static void BlockCopyCore(byte* from, byte* to, ulong byteCount) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)][System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.Success)] + public unsafe static void SecureZeroMemory(byte* buffer, int byteCount) { } + [System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.Success)] + public unsafe static void SecureZeroMemory(byte* buffer, System.IntPtr length) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)][System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.Success)] + public unsafe static void SecureZeroMemory(byte* buffer, uint byteCount) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)][System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.Success)] + public unsafe static void SecureZeroMemory(byte* buffer, ulong byteCount) { } + } + [System.Security.SuppressUnmanagedCodeSecurityAttribute] + internal static partial class UnsafeNativeMethods + { + private const string BCRYPT_LIB = "bcrypt.dll"; + private const string CRYPT32_LIB = "crypt32.dll"; + private const string NCRYPT_LIB = "ncrypt.dll"; + private static readonly System.Lazy _lazyBCryptLibHandle; + private static readonly System.Lazy _lazyCrypt32LibHandle; + private static readonly System.Lazy _lazyNCryptLibHandle; + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal static extern int BCryptCloseAlgorithmProvider(System.IntPtr hAlgorithm, uint dwFlags); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int BCryptCreateHash(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle hAlgorithm, out Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHashHandle phHash, System.IntPtr pbHashObject, uint cbHashObject, byte* pbSecret, uint cbSecret, uint dwFlags); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int BCryptDecrypt(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptKeyHandle hKey, byte* pbInput, uint cbInput, void* pPaddingInfo, byte* pbIV, uint cbIV, byte* pbOutput, uint cbOutput, out uint pcbResult, Microsoft.AspNetCore.Cryptography.Cng.BCryptEncryptFlags dwFlags); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int BCryptDeriveKeyPBKDF2(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle hPrf, byte* pbPassword, uint cbPassword, byte* pbSalt, uint cbSalt, ulong cIterations, byte* pbDerivedKey, uint cbDerivedKey, uint dwFlags); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)][System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.Success)] + internal static extern int BCryptDestroyHash(System.IntPtr hHash); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)][System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.Success)] + internal static extern int BCryptDestroyKey(System.IntPtr hKey); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal static extern int BCryptDuplicateHash(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHashHandle hHash, out Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHashHandle phNewHash, System.IntPtr pbHashObject, uint cbHashObject, uint dwFlags); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int BCryptEncrypt(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptKeyHandle hKey, byte* pbInput, uint cbInput, void* pPaddingInfo, byte* pbIV, uint cbIV, byte* pbOutput, uint cbOutput, out uint pcbResult, Microsoft.AspNetCore.Cryptography.Cng.BCryptEncryptFlags dwFlags); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int BCryptFinishHash(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHashHandle hHash, byte* pbOutput, uint cbOutput, uint dwFlags); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int BCryptGenerateSymmetricKey(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle hAlgorithm, out Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptKeyHandle phKey, System.IntPtr pbKeyObject, uint cbKeyObject, byte* pbSecret, uint cbSecret, uint dwFlags); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int BCryptGenRandom(System.IntPtr hAlgorithm, byte* pbBuffer, uint cbBuffer, Microsoft.AspNetCore.Cryptography.Cng.BCryptGenRandomFlags dwFlags); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int BCryptGetProperty(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHandle hObject, string pszProperty, void* pbOutput, uint cbOutput, out uint pcbResult, uint dwFlags); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int BCryptHashData(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHashHandle hHash, byte* pbInput, uint cbInput, uint dwFlags); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int BCryptKeyDerivation(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptKeyHandle hKey, Microsoft.AspNetCore.Cryptography.Cng.BCryptBufferDesc* pParameterList, byte* pbDerivedKey, uint cbDerivedKey, out uint pcbResult, uint dwFlags); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal static extern int BCryptOpenAlgorithmProvider(out Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle phAlgorithm, string pszAlgId, string pszImplementation, uint dwFlags); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int BCryptSetProperty(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHandle hObject, string pszProperty, void* pbInput, uint cbInput, uint dwFlags); + [System.Runtime.InteropServices.DllImport("crypt32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern bool CryptProtectData(Microsoft.AspNetCore.Cryptography.DATA_BLOB* pDataIn, System.IntPtr szDataDescr, Microsoft.AspNetCore.Cryptography.DATA_BLOB* pOptionalEntropy, System.IntPtr pvReserved, System.IntPtr pPromptStruct, uint dwFlags, out Microsoft.AspNetCore.Cryptography.DATA_BLOB pDataOut); + [System.Runtime.InteropServices.DllImport("crypt32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]public static extern bool CryptProtectMemory(System.Runtime.InteropServices.SafeHandle pData, uint cbData, uint dwFlags); + [System.Runtime.InteropServices.DllImport("crypt32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern bool CryptUnprotectData(Microsoft.AspNetCore.Cryptography.DATA_BLOB* pDataIn, System.IntPtr ppszDataDescr, Microsoft.AspNetCore.Cryptography.DATA_BLOB* pOptionalEntropy, System.IntPtr pvReserved, System.IntPtr pPromptStruct, uint dwFlags, out Microsoft.AspNetCore.Cryptography.DATA_BLOB pDataOut); + [System.Runtime.InteropServices.DllImport("crypt32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]public unsafe static extern bool CryptUnprotectMemory(byte* pData, uint cbData, uint dwFlags); + [System.Runtime.InteropServices.DllImport("crypt32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]public static extern bool CryptUnprotectMemory(System.Runtime.InteropServices.SafeHandle pData, uint cbData, uint dwFlags); + private static System.Lazy GetLazyLibraryHandle(string libraryName) { throw null; } + [System.Runtime.InteropServices.DllImport("ncrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)][System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.Success)] + internal static extern int NCryptCloseProtectionDescriptor(System.IntPtr hDescriptor); + [System.Runtime.InteropServices.DllImport("ncrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal static extern int NCryptCreateProtectionDescriptor(string pwszDescriptorString, uint dwFlags, out Microsoft.AspNetCore.Cryptography.SafeHandles.NCryptDescriptorHandle phDescriptor); + [System.Runtime.InteropServices.DllImport("ncrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal static extern int NCryptGetProtectionDescriptorInfo(Microsoft.AspNetCore.Cryptography.SafeHandles.NCryptDescriptorHandle hDescriptor, System.IntPtr pMemPara, uint dwInfoType, out Microsoft.AspNetCore.Cryptography.SafeHandles.LocalAllocHandle ppvInfo); + [System.Runtime.InteropServices.DllImport("ncrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int NCryptProtectSecret(Microsoft.AspNetCore.Cryptography.SafeHandles.NCryptDescriptorHandle hDescriptor, uint dwFlags, byte* pbData, uint cbData, System.IntPtr pMemPara, System.IntPtr hWnd, out Microsoft.AspNetCore.Cryptography.SafeHandles.LocalAllocHandle ppbProtectedBlob, out uint pcbProtectedBlob); + [System.Runtime.InteropServices.DllImport("ncrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int NCryptUnprotectSecret(out Microsoft.AspNetCore.Cryptography.SafeHandles.NCryptDescriptorHandle phDescriptor, uint dwFlags, byte* pbProtectedBlob, uint cbProtectedBlob, System.IntPtr pMemPara, System.IntPtr hWnd, out Microsoft.AspNetCore.Cryptography.SafeHandles.LocalAllocHandle ppbData, out uint pcbData); + [System.Runtime.InteropServices.DllImport("ncrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int NCryptUnprotectSecret(System.IntPtr phDescriptor, uint dwFlags, byte* pbProtectedBlob, uint cbProtectedBlob, System.IntPtr pMemPara, System.IntPtr hWnd, out Microsoft.AspNetCore.Cryptography.SafeHandles.LocalAllocHandle ppbData, out uint pcbData); + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]internal static void ThrowExceptionForBCryptStatus(int ntstatus) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]private static void ThrowExceptionForBCryptStatusImpl(int ntstatus) { } + public static void ThrowExceptionForLastCrypt32Error() { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]internal static void ThrowExceptionForNCryptStatus(int ntstatus) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]private static void ThrowExceptionForNCryptStatusImpl(int ntstatus) { } + } + internal static partial class WeakReferenceHelpers + { + public static T GetSharedInstance(ref System.WeakReference weakReference, System.Func factory) where T : class, System.IDisposable { throw null; } + } +} +namespace Microsoft.AspNetCore.Cryptography.Cng +{ + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct BCryptBuffer + { + public uint cbBuffer; // Length of buffer, in bytes + public BCryptKeyDerivationBufferType BufferType; // Buffer type + public IntPtr pvBuffer; // Pointer to buffer + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal unsafe partial struct BCryptBufferDesc + { + public uint ulVersion; // Version number + public uint cBuffers; // Number of buffers + public BCryptBuffer* pBuffers; // Pointer to array of buffers + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static void Initialize(ref Microsoft.AspNetCore.Cryptography.Cng.BCryptBufferDesc bufferDesc) { } + } + [System.FlagsAttribute] + internal enum BCryptEncryptFlags + { + BCRYPT_BLOCK_PADDING = 1, + } + [System.FlagsAttribute] + internal enum BCryptGenRandomFlags + { + BCRYPT_RNG_USE_ENTROPY_IN_BUFFER = 1, + BCRYPT_USE_SYSTEM_PREFERRED_RNG = 2, + } + internal enum BCryptKeyDerivationBufferType + { + KDF_HASH_ALGORITHM = 0, + KDF_SECRET_PREPEND = 1, + KDF_SECRET_APPEND = 2, + KDF_HMAC_KEY = 3, + KDF_TLS_PRF_LABEL = 4, + KDF_TLS_PRF_SEED = 5, + KDF_SECRET_HANDLE = 6, + KDF_TLS_PRF_PROTOCOL = 7, + KDF_ALGORITHMID = 8, + KDF_PARTYUINFO = 9, + KDF_PARTYVINFO = 10, + KDF_SUPPPUBINFO = 11, + KDF_SUPPPRIVINFO = 12, + KDF_LABEL = 13, + KDF_CONTEXT = 14, + KDF_SALT = 15, + KDF_ITERATION_COUNT = 16, + } + internal static partial class BCryptUtil + { + public unsafe static void GenRandom(byte* pbBuffer, uint cbBuffer) { } + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal unsafe partial struct BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO + { + public uint cbSize; + public uint dwInfoVersion; + public byte* pbNonce; + public uint cbNonce; + public byte* pbAuthData; + public uint cbAuthData; + public byte* pbTag; + public uint cbTag; + public byte* pbMacContext; + public uint cbMacContext; + public uint cbAAD; + public ulong cbData; + public uint dwFlags; + public static void Init(out Microsoft.AspNetCore.Cryptography.Cng.BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO info) { throw null; } + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct BCRYPT_KEY_LENGTHS_STRUCT + { + // MSDN says these fields represent the key length in bytes. + // It's wrong: these key lengths are all actually in bits. + internal uint dwMinLength; + internal uint dwMaxLength; + internal uint dwIncrement; + public void EnsureValidKeyLength(uint keyLengthInBits) { } + private bool IsValidKeyLength(uint keyLengthInBits) { throw null; } + } + internal static partial class CachedAlgorithmHandles + { + private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _aesCbc; + private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _aesGcm; + private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _hmacSha1; + private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _hmacSha256; + private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _hmacSha512; + private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _pbkdf2; + private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _sha1; + private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _sha256; + private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _sha512; + private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _sp800_108_ctr_hmac; + public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle AES_CBC { get { throw null; } } + public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle AES_GCM { get { throw null; } } + public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle HMAC_SHA1 { get { throw null; } } + public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle HMAC_SHA256 { get { throw null; } } + public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle HMAC_SHA512 { get { throw null; } } + public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle PBKDF2 { get { throw null; } } + public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle SHA1 { get { throw null; } } + public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle SHA256 { get { throw null; } } + public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle SHA512 { get { throw null; } } + public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle SP800_108_CTR_HMAC { get { throw null; } } + private static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle GetAesAlgorithm(string chainingMode) { throw null; } + private static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle GetHashAlgorithm(string algorithm) { throw null; } + private static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle GetHmacAlgorithm(string algorithm) { throw null; } + private static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle GetPbkdf2Algorithm() { throw null; } + private static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle GetSP800_108_CTR_HMACAlgorithm() { throw null; } + + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + private partial struct CachedAlgorithmInfo + { + private object _dummy; + public CachedAlgorithmInfo(System.Func factory) { throw null; } + public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle GetAlgorithmHandle(ref Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo cachedAlgorithmInfo) { throw null; } + } + } + [System.FlagsAttribute] + internal enum NCryptEncryptFlags + { + NCRYPT_NO_PADDING_FLAG = 1, + NCRYPT_PAD_PKCS1_FLAG = 2, + NCRYPT_PAD_OAEP_FLAG = 4, + NCRYPT_PAD_PSS_FLAG = 8, + NCRYPT_SILENT_FLAG = 64, + } + internal static partial class OSVersionUtil + { + private static readonly Microsoft.AspNetCore.Cryptography.Cng.OSVersionUtil.OSVersion _osVersion; + private static Microsoft.AspNetCore.Cryptography.Cng.OSVersionUtil.OSVersion GetOSVersion() { throw null; } + public static bool IsWindows() { throw null; } + public static bool IsWindows8OrLater() { throw null; } + private enum OSVersion + { + NotWindows = 0, + Win7OrLater = 1, + Win8OrLater = 2, + } + } +} +namespace Microsoft.AspNetCore.Cryptography.Internal +{ + internal static partial class Resources + { + private static System.Resources.ResourceManager s_resourceManager; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private static System.Globalization.CultureInfo _Culture_k__BackingField; + internal static string BCryptAlgorithmHandle_ProviderNotFound { get { throw null; } } + internal static string BCRYPT_KEY_LENGTHS_STRUCT_InvalidKeyLength { get { throw null; } } + internal static System.Globalization.CultureInfo Culture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal static string Platform_Windows7Required { get { throw null; } } + internal static string Platform_Windows8Required { get { throw null; } } + internal static System.Resources.ResourceManager ResourceManager { get { throw null; } } + internal static string FormatBCryptAlgorithmHandle_ProviderNotFound(object p0) { throw null; } + internal static string FormatBCRYPT_KEY_LENGTHS_STRUCT_InvalidKeyLength(object p0, object p1, object p2, object p3) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]internal static string GetResourceString(string resourceKey, string defaultValue = null) { throw null; } + private static string GetResourceString(string resourceKey, string[] formatterNames) { throw null; } + } +} +namespace Microsoft.AspNetCore.Cryptography.SafeHandles +{ + internal sealed partial class BCryptAlgorithmHandle : Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHandle + { + private BCryptAlgorithmHandle() { } + public Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHashHandle CreateHash() { throw null; } + private unsafe Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHashHandle CreateHashCore(byte* pbKey, uint cbKey) { throw null; } + public unsafe Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHashHandle CreateHmac(byte* pbKey, uint cbKey) { throw null; } + public unsafe Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptKeyHandle GenerateSymmetricKey(byte* pbSecret, uint cbSecret) { throw null; } + public string GetAlgorithmName() { throw null; } + public uint GetCipherBlockLength() { throw null; } + public uint GetHashBlockLength() { throw null; } + public uint GetHashDigestLength() { throw null; } + public Microsoft.AspNetCore.Cryptography.Cng.BCRYPT_KEY_LENGTHS_STRUCT GetSupportedKeyLengths() { throw null; } + public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle OpenAlgorithmHandle(string algorithmId, string implementation = null, bool hmac = false) { throw null; } + protected override bool ReleaseHandle() { throw null; } + public void SetChainingMode(string chainingMode) { } + } + internal abstract partial class BCryptHandle : Microsoft.Win32.SafeHandles.SafeHandleZeroOrMinusOneIsInvalid + { + protected BCryptHandle() : base (default(bool)) { } + protected unsafe uint GetProperty(string pszProperty, void* pbOutput, uint cbOutput) { throw null; } + protected unsafe void SetProperty(string pszProperty, void* pbInput, uint cbInput) { } + } + internal sealed partial class BCryptHashHandle : Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHandle + { + private Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle _algProviderHandle; + private BCryptHashHandle() { } + public Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHashHandle DuplicateHash() { throw null; } + public unsafe void HashData(byte* pbInput, uint cbInput, byte* pbHashDigest, uint cbHashDigest) { } + protected override bool ReleaseHandle() { throw null; } + internal void SetAlgorithmProviderHandle(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle algProviderHandle) { } + } + internal sealed partial class BCryptKeyHandle : Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHandle + { + private Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle _algProviderHandle; + private BCryptKeyHandle() { } + protected override bool ReleaseHandle() { throw null; } + internal void SetAlgorithmProviderHandle(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle algProviderHandle) { } + } + internal partial class LocalAllocHandle : Microsoft.Win32.SafeHandles.SafeHandleZeroOrMinusOneIsInvalid + { + protected LocalAllocHandle() : base (default(bool)) { } + protected override bool ReleaseHandle() { throw null; } + } + internal sealed partial class NCryptDescriptorHandle : Microsoft.Win32.SafeHandles.SafeHandleZeroOrMinusOneIsInvalid + { + private NCryptDescriptorHandle() : base (default(bool)) { } + public string GetProtectionDescriptorRuleString() { throw null; } + protected override bool ReleaseHandle() { throw null; } + } + internal sealed partial class SafeLibraryHandle : Microsoft.Win32.SafeHandles.SafeHandleZeroOrMinusOneIsInvalid + { + private SafeLibraryHandle() : base (default(bool)) { } + public bool DoesProcExist(string lpProcName) { throw null; } + public void ForbidUnload() { } + public string FormatMessage(int messageId) { throw null; } + public TDelegate GetProcAddress(string lpProcName, bool throwIfNotFound = true) where TDelegate : class { throw null; } + public static Microsoft.AspNetCore.Cryptography.SafeHandles.SafeLibraryHandle Open(string filename) { throw null; } + protected override bool ReleaseHandle() { throw null; } + [System.Security.SuppressUnmanagedCodeSecurityAttribute] + private static partial class UnsafeNativeMethods + { + [System.Runtime.InteropServices.DllImport("kernel32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]public static extern int FormatMessage(uint dwFlags, Microsoft.AspNetCore.Cryptography.SafeHandles.SafeLibraryHandle lpSource, uint dwMessageId, uint dwLanguageId, out Microsoft.AspNetCore.Cryptography.SafeHandles.LocalAllocHandle lpBuffer, uint nSize, System.IntPtr Arguments); + [System.Runtime.InteropServices.DllImport("kernel32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)][System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.Success)] + internal static extern bool FreeLibrary(System.IntPtr hModule); + [System.Runtime.InteropServices.DllImport("kernel32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal static extern bool GetModuleHandleEx(uint dwFlags, Microsoft.AspNetCore.Cryptography.SafeHandles.SafeLibraryHandle lpModuleName, out System.IntPtr phModule); + [System.Runtime.InteropServices.DllImport("kernel32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal static extern System.IntPtr GetProcAddress(Microsoft.AspNetCore.Cryptography.SafeHandles.SafeLibraryHandle hModule, string lpProcName); + [System.Runtime.InteropServices.DllImport("kernel32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal static extern Microsoft.AspNetCore.Cryptography.SafeHandles.SafeLibraryHandle LoadLibraryEx(string lpFileName, System.IntPtr hFile, uint dwFlags); + internal static void ThrowExceptionForLastWin32Error() { } + } + } + internal sealed partial class SecureLocalAllocHandle : Microsoft.AspNetCore.Cryptography.SafeHandles.LocalAllocHandle + { + private readonly System.IntPtr _cb; + private SecureLocalAllocHandle(System.IntPtr cb) { } + public System.IntPtr Length { get { throw null; } } + public static Microsoft.AspNetCore.Cryptography.SafeHandles.SecureLocalAllocHandle Allocate(System.IntPtr cb) { throw null; } + [System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.MayFail)] + private void AllocateImpl(System.IntPtr cb) { } + public Microsoft.AspNetCore.Cryptography.SafeHandles.SecureLocalAllocHandle Duplicate() { throw null; } + protected override bool ReleaseHandle() { throw null; } + } +} diff --git a/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj b/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj index ec4ae22e0e8f..6cbd3bfb9c40 100644 --- a/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj +++ b/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj @@ -2,9 +2,12 @@ netstandard2.0 + true + $(NoWarn);CS0169 - + + diff --git a/src/DataProtection/Extensions/test/Microsoft.AspNetCore.DataProtection.Extensions.Tests.csproj b/src/DataProtection/Extensions/test/Microsoft.AspNetCore.DataProtection.Extensions.Tests.csproj index 2ed2eb310d60..87c0b1b93459 100644 --- a/src/DataProtection/Extensions/test/Microsoft.AspNetCore.DataProtection.Extensions.Tests.csproj +++ b/src/DataProtection/Extensions/test/Microsoft.AspNetCore.DataProtection.Extensions.Tests.csproj @@ -12,6 +12,7 @@ + From bef8e00dd363fb24c497c285abc75cd3630b2992 Mon Sep 17 00:00:00 2001 From: John Luo Date: Thu, 10 Oct 2019 16:56:44 -0700 Subject: [PATCH 027/116] Kestrel --- eng/targets/ReferenceAssembly.targets | 2 +- .../ref/Directory.Build.props | 8 ++++++ ...ft.AspNetCore.Cryptography.Internal.csproj | 2 -- .../Kestrel/Core/ref/Directory.Build.props | 7 +++++ ...t.AspNetCore.Server.Kestrel.Core.Manual.cs | 26 +++++++++++++++++++ ...soft.AspNetCore.Server.Kestrel.Core.csproj | 1 + ...oft.AspNetCore.Server.Kestrel.Tests.csproj | 1 + .../InMemory.FunctionalTests.csproj | 1 + .../Libuv.BindTests/Libuv.BindTests.csproj | 3 ++- .../Sockets.BindTests.csproj | 1 + 10 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 src/DataProtection/Cryptography.Internal/ref/Directory.Build.props create mode 100644 src/Servers/Kestrel/Core/ref/Directory.Build.props create mode 100644 src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.Manual.cs diff --git a/eng/targets/ReferenceAssembly.targets b/eng/targets/ReferenceAssembly.targets index 74cbf583e339..dbc6eb63a68e 100644 --- a/eng/targets/ReferenceAssembly.targets +++ b/eng/targets/ReferenceAssembly.targets @@ -59,7 +59,7 @@ <_GenAPICommand Condition="'$(MSBuildRuntimeType)' == 'core'">"$(DotNetTool)" --roll-forward-on-no-candidate-fx 2 "$(_GenAPIPath)" <_GenAPICmd>$(_GenAPICommand) - <_GenAPICmd>$(_GenAPICmd) "$(TargetPath)" + <_GenAPICmd>$(_GenAPICmd) "$(TargetPath)" $(AdditionalGenApiCmdOptions) <_GenAPICmd>$(_GenAPICmd) --lib-path "@(_ReferencePathDirectories)" <_GenAPICmd>$(_GenAPICmd) --out "$(_RefSourceFileOutputPath)" <_GenAPICmd>$(_GenAPICmd) --header-file "$(RepoRoot)/eng/LicenseHeader.txt" diff --git a/src/DataProtection/Cryptography.Internal/ref/Directory.Build.props b/src/DataProtection/Cryptography.Internal/ref/Directory.Build.props new file mode 100644 index 000000000000..b500fb5d98e7 --- /dev/null +++ b/src/DataProtection/Cryptography.Internal/ref/Directory.Build.props @@ -0,0 +1,8 @@ + + + + + true + $(NoWarn);CS0169 + + \ No newline at end of file diff --git a/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj b/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj index 6cbd3bfb9c40..0512d98b0d61 100644 --- a/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj +++ b/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj @@ -2,8 +2,6 @@ netstandard2.0 - true - $(NoWarn);CS0169 diff --git a/src/Servers/Kestrel/Core/ref/Directory.Build.props b/src/Servers/Kestrel/Core/ref/Directory.Build.props new file mode 100644 index 000000000000..ea5de23302dc --- /dev/null +++ b/src/Servers/Kestrel/Core/ref/Directory.Build.props @@ -0,0 +1,7 @@ + + + + + $(NoWarn);CS0169 + + \ No newline at end of file diff --git a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.Manual.cs b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.Manual.cs new file mode 100644 index 000000000000..c56f35173514 --- /dev/null +++ b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.Manual.cs @@ -0,0 +1,26 @@ +// 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.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Libuv.FunctionalTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Sockets.FunctionalTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("InMemory.FunctionalTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Sockets.BindTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Libuv.BindTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Core.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Performance, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] + +namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal +{ + internal partial class KestrelServerOptionsSetup : Microsoft.Extensions.Options.IConfigureOptions + { + private System.IServiceProvider _services; + public KestrelServerOptionsSetup(System.IServiceProvider services) { } + public void Configure(Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerOptions options) { } + } +} diff --git a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj index 367e32ffec62..84e25fa0d16f 100644 --- a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj +++ b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj @@ -5,6 +5,7 @@ + diff --git a/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj b/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj index 2a9f55cd6fd5..678811e9621e 100644 --- a/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj +++ b/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj @@ -20,6 +20,7 @@ + diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj b/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj index c00165c4d433..156b60c6bb30 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj @@ -21,6 +21,7 @@ + diff --git a/src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj b/src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj index 9019aa904bc5..aa9b1dae0825 100644 --- a/src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj +++ b/src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj @@ -10,7 +10,7 @@ - + @@ -22,6 +22,7 @@ + diff --git a/src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj b/src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj index cf9e6cfaef9a..d026d1aee400 100644 --- a/src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj +++ b/src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj @@ -17,6 +17,7 @@ + From cf9aa0aa3797fda9119cfea29289d0adfefb30cd Mon Sep 17 00:00:00 2001 From: John Luo Date: Thu, 10 Oct 2019 17:15:08 -0700 Subject: [PATCH 028/116] Hosting --- .../Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj b/src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj index 4bc7d5cf3891..7eafcfb863c2 100644 --- a/src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj +++ b/src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj @@ -17,6 +17,7 @@ + From 7d533bc623c041b1957d43ef348f3226f3cd5d77 Mon Sep 17 00:00:00 2001 From: John Luo Date: Thu, 10 Oct 2019 17:22:18 -0700 Subject: [PATCH 029/116] Http --- .../test/Microsoft.AspNetCore.Http.Abstractions.Tests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Http/Http.Abstractions/test/Microsoft.AspNetCore.Http.Abstractions.Tests.csproj b/src/Http/Http.Abstractions/test/Microsoft.AspNetCore.Http.Abstractions.Tests.csproj index 962602a87265..b6fa741a9285 100644 --- a/src/Http/Http.Abstractions/test/Microsoft.AspNetCore.Http.Abstractions.Tests.csproj +++ b/src/Http/Http.Abstractions/test/Microsoft.AspNetCore.Http.Abstractions.Tests.csproj @@ -10,6 +10,7 @@ + From 1044db1d7146366c3f473bcb18d06421d7fd1406 Mon Sep 17 00:00:00 2001 From: John Luo Date: Fri, 11 Oct 2019 10:55:35 -0700 Subject: [PATCH 030/116] Mvc --- eng/GenAPI.exclusions.txt | 9 +- .../Microsoft.AspNetCore.Antiforgery.csproj | 2 + ...ft.AspNetCore.Mvc.Abstractions.Test.csproj | 1 + ...oft.AspNetCore.Mvc.ApiExplorer.Test.csproj | 1 + src/Mvc/Mvc.Core/ref/Directory.Build.props | 7 + .../Microsoft.AspNetCore.Mvc.Core.Manual.cs | 1265 +++++++++++++++++ .../ref/Microsoft.AspNetCore.Mvc.Core.csproj | 1 + .../src/Formatters/MediaTypeHeaderValues.cs | 3 + .../src/Microsoft.AspNetCore.Mvc.Core.csproj | 2 + .../Microsoft.AspNetCore.Mvc.Core.Test.csproj | 1 + src/Mvc/Mvc.Cors/ref/Directory.Build.props | 7 + .../Microsoft.AspNetCore.Mvc.Cors.Manual.cs | 23 + .../ref/Microsoft.AspNetCore.Mvc.Cors.csproj | 1 + .../ref/Directory.Build.props | 8 + ...t.AspNetCore.Mvc.DataAnnotations.Manual.cs | 103 ++ ...soft.AspNetCore.Mvc.DataAnnotations.csproj | 1 + ...AspNetCore.Mvc.DataAnnotations.Test.csproj | 1 + ...osoft.AspNetCore.Mvc.Formatters.Xml.csproj | 2 + ....AspNetCore.Mvc.Formatters.Xml.Test.csproj | 1 + .../src/MediaTypeHeaderValues.cs | 22 - ...osoft.AspNetCore.Mvc.NewtonsoftJson.csproj | 1 - ....AspNetCore.Mvc.NewtonsoftJson.Test.csproj | 1 + ...e.Mvc.Razor.RuntimeCompilation.Test.csproj | 1 + src/Mvc/Mvc.Razor/ref/Directory.Build.props | 7 + .../Microsoft.AspNetCore.Mvc.Razor.Manual.cs | 245 ++++ .../ref/Microsoft.AspNetCore.Mvc.Razor.csproj | 1 + ...soft.AspNetCore.Mvc.Razor.netcoreapp3.0.cs | 8 - .../Infrastructure/CryptographyAlgorithms.cs | 25 - .../DefaultFileVersionProvider.cs | 1 + .../src/Microsoft.AspNetCore.Mvc.Razor.csproj | 2 + ...Microsoft.AspNetCore.Mvc.Razor.Test.csproj | 3 + .../Mvc.RazorPages/ref/Directory.Build.props | 4 + ...ore.Mvc.RazorPages.netcoreapp3.0.Manual.cs | 315 ++++ ...Microsoft.AspNetCore.Mvc.RazorPages.csproj | 2 + ...soft.AspNetCore.Mvc.RazorPages.Test.csproj | 2 + .../Mvc.TagHelpers/src/Cache/CacheTagKey.cs | 1 + ...Microsoft.AspNetCore.Mvc.TagHelpers.csproj | 3 +- ...soft.AspNetCore.Mvc.TagHelpers.Test.csproj | 2 + .../ref/Directory.Build.props | 8 + ...soft.AspNetCore.Mvc.ViewFeatures.Manual.cs | 265 ++++ ...crosoft.AspNetCore.Mvc.ViewFeatures.csproj | 1 + ...crosoft.AspNetCore.Mvc.ViewFeatures.csproj | 7 +- ...ft.AspNetCore.Mvc.ViewFeatures.Test.csproj | 2 + ...oft.AspNetCore.Mvc.IntegrationTests.csproj | 1 + .../CryptographyAlgorithms.cs | 0 45 files changed, 2308 insertions(+), 61 deletions(-) create mode 100644 src/Mvc/Mvc.Core/ref/Directory.Build.props create mode 100644 src/Mvc/Mvc.Cors/ref/Directory.Build.props create mode 100644 src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.Manual.cs create mode 100644 src/Mvc/Mvc.DataAnnotations/ref/Directory.Build.props create mode 100644 src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.Manual.cs delete mode 100644 src/Mvc/Mvc.NewtonsoftJson/src/MediaTypeHeaderValues.cs create mode 100644 src/Mvc/Mvc.Razor/ref/Directory.Build.props create mode 100644 src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.Manual.cs delete mode 100644 src/Mvc/Mvc.Razor/src/Infrastructure/CryptographyAlgorithms.cs create mode 100644 src/Mvc/Mvc.ViewFeatures/ref/Directory.Build.props create mode 100644 src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs rename src/{Antiforgery/src/Internal => Shared/CryptographyAlgorithms}/CryptographyAlgorithms.cs (100%) diff --git a/eng/GenAPI.exclusions.txt b/eng/GenAPI.exclusions.txt index ebabc0ac7de5..0c4ce95fc2cb 100644 --- a/eng/GenAPI.exclusions.txt +++ b/eng/GenAPI.exclusions.txt @@ -2,4 +2,11 @@ T:Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame # Manually implemented - https://github.com/dotnet/arcade/issues/2066 T:Microsoft.AspNetCore.Mvc.ApplicationModels.PageParameterModel -T:Microsoft.AspNetCore.Mvc.ApplicationModels.PagePropertyModel \ No newline at end of file +T:Microsoft.AspNetCore.Mvc.ApplicationModels.PagePropertyModel +# Manually implemented - Need to include internal setter +T:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider +F:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider.{Cache}k__BackingField +M:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider.#ctor +P:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider.Cache +M:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider.get_Cache +M:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider.set_Cache(Microsoft.Extensions.Caching.Memory.IMemoryCache) \ No newline at end of file diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery.csproj b/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery.csproj index 5fb2ea705079..276d0fd0dff9 100644 --- a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery.csproj +++ b/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery.csproj @@ -10,6 +10,8 @@ + + diff --git a/src/Mvc/Mvc.Abstractions/test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj b/src/Mvc/Mvc.Abstractions/test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj index 28eee994cdc3..bcec533abdb5 100644 --- a/src/Mvc/Mvc.Abstractions/test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj +++ b/src/Mvc/Mvc.Abstractions/test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj @@ -6,6 +6,7 @@ + diff --git a/src/Mvc/Mvc.ApiExplorer/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj b/src/Mvc/Mvc.ApiExplorer/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj index df8bb63d3bc9..5e385ecd7a1b 100644 --- a/src/Mvc/Mvc.ApiExplorer/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj +++ b/src/Mvc/Mvc.ApiExplorer/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj @@ -5,6 +5,7 @@ + diff --git a/src/Mvc/Mvc.Core/ref/Directory.Build.props b/src/Mvc/Mvc.Core/ref/Directory.Build.props new file mode 100644 index 000000000000..ea5de23302dc --- /dev/null +++ b/src/Mvc/Mvc.Core/ref/Directory.Build.props @@ -0,0 +1,7 @@ + + + + + $(NoWarn);CS0169 + + \ No newline at end of file diff --git a/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.Manual.cs b/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.Manual.cs index d3e44fb47120..e117f8360b33 100644 --- a/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.Manual.cs +++ b/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.Manual.cs @@ -5,3 +5,1268 @@ using Microsoft.AspNetCore.Mvc.Formatters; [assembly: TypeForwardedTo(typeof(InputFormatterException))] + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.ApiExplorer, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Cors, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.DataAnnotations, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Formatters.Xml, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Localization, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.NewtonsoftJson, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.RazorPages, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.TagHelpers, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Testing, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.ViewFeatures, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Abstractions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.ApiExplorer.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Core.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Core.TestCommon, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Cors.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.DataAnnotations.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Formatters.Xml.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.IntegrationTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Localization.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.RazorPages.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.TagHelpers.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.ViewFeatures.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Views.TestCommon, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Performance, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] + +[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] + +namespace Microsoft.AspNetCore.Internal +{ + internal partial interface IResponseCacheFilter + { + } +} +namespace Microsoft.AspNetCore.Mvc +{ + internal partial class MvcCoreMvcOptionsSetup + { + private readonly Microsoft.Extensions.Options.IOptions _jsonOptions; + private readonly Microsoft.Extensions.Logging.ILoggerFactory _loggerFactory; + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IHttpRequestStreamReaderFactory _readerFactory; + public MvcCoreMvcOptionsSetup(Microsoft.AspNetCore.Mvc.Infrastructure.IHttpRequestStreamReaderFactory readerFactory) { } + public MvcCoreMvcOptionsSetup(Microsoft.AspNetCore.Mvc.Infrastructure.IHttpRequestStreamReaderFactory readerFactory, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.Extensions.Options.IOptions jsonOptions) { } + public void Configure(Microsoft.AspNetCore.Mvc.MvcOptions options) { } + internal static void ConfigureAdditionalModelMetadataDetailsProviders(System.Collections.Generic.IList modelMetadataDetailsProviders) { } + public void PostConfigure(string name, Microsoft.AspNetCore.Mvc.MvcOptions options) { } + } +} +namespace Microsoft.AspNetCore.Mvc.Controllers +{ + internal delegate System.Threading.Tasks.Task ControllerBinderDelegate(Microsoft.AspNetCore.Mvc.ControllerContext controllerContext, object controller, System.Collections.Generic.Dictionary arguments); +} +namespace Microsoft.AspNetCore.Mvc.ActionConstraints +{ + internal partial class DefaultActionConstraintProvider : Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraintProvider + { + public DefaultActionConstraintProvider() { } + public int Order { get { throw null; } } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintProviderContext context) { } + private void ProvideConstraint(Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintItem item, System.IServiceProvider services) { } + } + internal partial class ActionConstraintCache + { + private readonly Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraintProvider[] _actionConstraintProviders; + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider _collectionProvider; + private volatile Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintCache.InnerCache _currentCache; + public ActionConstraintCache(Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider collectionProvider, System.Collections.Generic.IEnumerable actionConstraintProviders) { } + internal Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintCache.InnerCache CurrentCache { get { throw null; } } + private void ExecuteProviders(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor action, System.Collections.Generic.List items) { } + private System.Collections.Generic.IReadOnlyList ExtractActionConstraints(System.Collections.Generic.List items) { throw null; } + public System.Collections.Generic.IReadOnlyList GetActionConstraints(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor action) { throw null; } + private System.Collections.Generic.IReadOnlyList GetActionConstraintsFromEntry(Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintCache.CacheEntry entry, Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor action) { throw null; } + internal readonly partial struct CacheEntry + { + private readonly object _dummy; + public CacheEntry(System.Collections.Generic.IReadOnlyList actionConstraints) { throw null; } + public CacheEntry(System.Collections.Generic.List items) { throw null; } + public System.Collections.Generic.IReadOnlyList ActionConstraints { get { throw null; } } + public System.Collections.Generic.List Items { get { throw null; } } + } + internal partial class InnerCache + { + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.ActionDescriptorCollection _actions; + private readonly System.Collections.Concurrent.ConcurrentDictionary _Entries_k__BackingField; + public InnerCache(Microsoft.AspNetCore.Mvc.Infrastructure.ActionDescriptorCollection actions) { } + public System.Collections.Concurrent.ConcurrentDictionary Entries { get { throw null; } } + public int Version { get { throw null; } } + } + } +} +namespace Microsoft.AspNetCore.Mvc.ApplicationModels +{ + internal partial class ApiBehaviorApplicationModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelProvider + { + private readonly System.Collections.Generic.List _ActionModelConventions_k__BackingField; + public ApiBehaviorApplicationModelProvider(Microsoft.Extensions.Options.IOptions apiBehaviorOptions, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider, Microsoft.AspNetCore.Mvc.Infrastructure.IClientErrorFactory clientErrorFactory, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + public System.Collections.Generic.List ActionModelConventions { get { throw null; } } + public int Order { get { throw null; } } + private static void EnsureActionIsAttributeRouted(Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel actionModel) { } + private static bool IsApiController(Microsoft.AspNetCore.Mvc.ApplicationModels.ControllerModel controller) { throw null; } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + } + internal partial class ApplicationModelFactory + { + private readonly Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelProvider[] _applicationModelProviders; + private readonly System.Collections.Generic.IList _conventions; + public ApplicationModelFactory(System.Collections.Generic.IEnumerable applicationModelProviders, Microsoft.Extensions.Options.IOptions options) { } + private static void AddActionToMethodInfoMap(System.Collections.Generic.Dictionary>> actionsByMethod, Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel action, Microsoft.AspNetCore.Mvc.ApplicationModels.SelectorModel selector) { } + private static void AddActionToRouteNameMap(System.Collections.Generic.Dictionary>> actionsByRouteName, Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel action, Microsoft.AspNetCore.Mvc.ApplicationModels.SelectorModel selector) { } + private static System.Collections.Generic.List AddErrorNumbers(System.Collections.Generic.IEnumerable namedRoutedErrors) { throw null; } + public Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModel CreateApplicationModel(System.Collections.Generic.IEnumerable controllerTypes) { throw null; } + private static string CreateAttributeRoutingAggregateErrorMessage(System.Collections.Generic.IEnumerable individualErrors) { throw null; } + private static string CreateMixedRoutedActionDescriptorsErrorMessage(System.Reflection.MethodInfo method, System.Collections.Generic.List> actions) { throw null; } + public static System.Collections.Generic.List Flatten(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModel application, System.Func flattener) { throw null; } + private static void ReplaceAttributeRouteTokens(Microsoft.AspNetCore.Mvc.ApplicationModels.ControllerModel controller, Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel action, Microsoft.AspNetCore.Mvc.ApplicationModels.SelectorModel selector, System.Collections.Generic.List errors) { } + private static void ValidateActionGroupConfiguration(System.Reflection.MethodInfo method, System.Collections.Generic.List> actions, System.Collections.Generic.IDictionary routingConfigurationErrors) { } + private static System.Collections.Generic.List ValidateNamedAttributeRoutedActions(System.Collections.Generic.Dictionary>> actionsByRouteName) { throw null; } + } + internal partial class ControllerActionDescriptorProvider + { + private readonly Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelFactory _applicationModelFactory; + private readonly Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager _partManager; + public ControllerActionDescriptorProvider(Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager partManager, Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelFactory applicationModelFactory) { } + public int Order { get { throw null; } } + private System.Collections.Generic.IEnumerable GetControllerTypes() { throw null; } + internal System.Collections.Generic.IEnumerable GetDescriptors() { throw null; } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptorProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptorProviderContext context) { } + } + internal partial class AuthorizationApplicationModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelProvider + { + private readonly Microsoft.AspNetCore.Mvc.MvcOptions _mvcOptions; + private readonly Microsoft.AspNetCore.Authorization.IAuthorizationPolicyProvider _policyProvider; + public AuthorizationApplicationModelProvider(Microsoft.AspNetCore.Authorization.IAuthorizationPolicyProvider policyProvider, Microsoft.Extensions.Options.IOptions mvcOptions) { } + public int Order { get { throw null; } } + public static Microsoft.AspNetCore.Mvc.Authorization.AuthorizeFilter GetFilter(Microsoft.AspNetCore.Authorization.IAuthorizationPolicyProvider policyProvider, System.Collections.Generic.IEnumerable authData) { throw null; } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + } + internal partial class DefaultApplicationModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelProvider + { + private readonly Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider _modelMetadataProvider; + private readonly Microsoft.AspNetCore.Mvc.MvcOptions _mvcOptions; + private readonly System.Func _supportsAllRequests; + private readonly System.Func _supportsNonGetRequests; + public DefaultApplicationModelProvider(Microsoft.Extensions.Options.IOptions mvcOptionsAccessor, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider) { } + public int Order { get { throw null; } } + private static void AddRange(System.Collections.Generic.IList list, System.Collections.Generic.IEnumerable items) { } + private string CanonicalizeActionName(string actionName) { throw null; } + internal Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel CreateActionModel(System.Reflection.TypeInfo typeInfo, System.Reflection.MethodInfo methodInfo) { throw null; } + internal Microsoft.AspNetCore.Mvc.ApplicationModels.ControllerModel CreateControllerModel(System.Reflection.TypeInfo typeInfo) { throw null; } + internal Microsoft.AspNetCore.Mvc.ApplicationModels.ParameterModel CreateParameterModel(System.Reflection.ParameterInfo parameterInfo) { throw null; } + internal Microsoft.AspNetCore.Mvc.ApplicationModels.PropertyModel CreatePropertyModel(System.Reflection.PropertyInfo propertyInfo) { throw null; } + private static Microsoft.AspNetCore.Mvc.ApplicationModels.SelectorModel CreateSelectorModel(Microsoft.AspNetCore.Mvc.Routing.IRouteTemplateProvider route, System.Collections.Generic.IList attributes) { throw null; } + private System.Collections.Generic.IList CreateSelectors(System.Collections.Generic.IList attributes) { throw null; } + private static bool InRouteProviders(System.Collections.Generic.List routeProviders, object attribute) { throw null; } + internal bool IsAction(System.Reflection.TypeInfo typeInfo, System.Reflection.MethodInfo methodInfo) { throw null; } + private bool IsIDisposableMethod(System.Reflection.MethodInfo methodInfo) { throw null; } + private bool IsSilentRouteAttribute(Microsoft.AspNetCore.Mvc.Routing.IRouteTemplateProvider routeTemplateProvider) { throw null; } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + } +} +namespace Microsoft.AspNetCore.Mvc.Core +{ + internal static partial class Resources + { + private static System.Resources.ResourceManager s_resourceManager; + private static System.Globalization.CultureInfo _Culture_k__BackingField; + internal static string AcceptHeaderParser_ParseAcceptHeader_InvalidValues { get { throw null; } } + internal static string ActionDescriptorMustBeBasedOnControllerAction { get { throw null; } } + internal static string ActionExecutor_UnexpectedTaskInstance { get { throw null; } } + internal static string ActionExecutor_WrappedTaskInstance { get { throw null; } } + internal static string ActionInvokerFactory_CouldNotCreateInvoker { get { throw null; } } + internal static string ActionResult_ActionReturnValueCannotBeNull { get { throw null; } } + internal static string ApiController_AttributeRouteRequired { get { throw null; } } + internal static string ApiController_MultipleBodyParametersFound { get { throw null; } } + internal static string ApiConventionMethod_AmbiguousMethodName { get { throw null; } } + internal static string ApiConventionMethod_NoMethodFound { get { throw null; } } + internal static string ApiConventionMustBeStatic { get { throw null; } } + internal static string ApiConventions_Title_400 { get { throw null; } } + internal static string ApiConventions_Title_401 { get { throw null; } } + internal static string ApiConventions_Title_403 { get { throw null; } } + internal static string ApiConventions_Title_404 { get { throw null; } } + internal static string ApiConventions_Title_406 { get { throw null; } } + internal static string ApiConventions_Title_409 { get { throw null; } } + internal static string ApiConventions_Title_415 { get { throw null; } } + internal static string ApiConventions_Title_422 { get { throw null; } } + internal static string ApiConventions_Title_500 { get { throw null; } } + internal static string ApiConvention_UnsupportedAttributesOnConvention { get { throw null; } } + internal static string ApiExplorer_UnsupportedAction { get { throw null; } } + internal static string ApplicationAssembliesProvider_DuplicateRelatedAssembly { get { throw null; } } + internal static string ApplicationAssembliesProvider_RelatedAssemblyCannotDefineAdditional { get { throw null; } } + internal static string ApplicationPartFactory_InvalidFactoryType { get { throw null; } } + internal static string ArgumentCannotBeNullOrEmpty { get { throw null; } } + internal static string Argument_InvalidOffsetLength { get { throw null; } } + internal static string AsyncActionFilter_InvalidShortCircuit { get { throw null; } } + internal static string AsyncResourceFilter_InvalidShortCircuit { get { throw null; } } + internal static string AsyncResultFilter_InvalidShortCircuit { get { throw null; } } + internal static string AttributeRoute_AggregateErrorMessage { get { throw null; } } + internal static string AttributeRoute_AggregateErrorMessage_ErrorNumber { get { throw null; } } + internal static string AttributeRoute_CannotContainParameter { get { throw null; } } + internal static string AttributeRoute_DuplicateNames { get { throw null; } } + internal static string AttributeRoute_DuplicateNames_Item { get { throw null; } } + internal static string AttributeRoute_IndividualErrorMessage { get { throw null; } } + internal static string AttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod { get { throw null; } } + internal static string AttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod_Item { get { throw null; } } + internal static string AttributeRoute_NullTemplateRepresentation { get { throw null; } } + internal static string AttributeRoute_TokenReplacement_EmptyTokenNotAllowed { get { throw null; } } + internal static string AttributeRoute_TokenReplacement_ImbalancedSquareBrackets { get { throw null; } } + internal static string AttributeRoute_TokenReplacement_InvalidSyntax { get { throw null; } } + internal static string AttributeRoute_TokenReplacement_ReplacementValueNotFound { get { throw null; } } + internal static string AttributeRoute_TokenReplacement_UnclosedToken { get { throw null; } } + internal static string AttributeRoute_TokenReplacement_UnescapedBraceInToken { get { throw null; } } + internal static string AuthorizeFilter_AuthorizationPolicyCannotBeCreated { get { throw null; } } + internal static string BinderType_MustBeIModelBinder { get { throw null; } } + internal static string BindingSource_CannotBeComposite { get { throw null; } } + internal static string BindingSource_CannotBeGreedy { get { throw null; } } + internal static string CacheProfileNotFound { get { throw null; } } + internal static string CandidateResolver_DifferentCasedReference { get { throw null; } } + internal static string Common_PropertyNotFound { get { throw null; } } + internal static string ComplexTypeModelBinder_NoParameterlessConstructor_ForParameter { get { throw null; } } + internal static string ComplexTypeModelBinder_NoParameterlessConstructor_ForProperty { get { throw null; } } + internal static string ComplexTypeModelBinder_NoParameterlessConstructor_ForType { get { throw null; } } + internal static string CouldNotCreateIModelBinder { get { throw null; } } + internal static System.Globalization.CultureInfo Culture { get { throw null; } set { } } + internal static string DefaultActionSelector_AmbiguousActions { get { throw null; } } + internal static string FileResult_InvalidPath { get { throw null; } } + internal static string FileResult_PathNotRooted { get { throw null; } } + internal static string FilterFactoryAttribute_TypeMustImplementIFilter { get { throw null; } } + internal static string FormatFormatterMappings_GetMediaTypeMappingForFormat_InvalidFormat { get { throw null; } } + internal static string FormatterMappings_NotValidMediaType { get { throw null; } } + internal static string Formatter_NoMediaTypes { get { throw null; } } + internal static string Format_NotValid { get { throw null; } } + internal static string FormCollectionModelBinder_CannotBindToFormCollection { get { throw null; } } + internal static string HtmlGeneration_NonPropertyValueMustBeNumber { get { throw null; } } + internal static string HtmlGeneration_ValueIsInvalid { get { throw null; } } + internal static string HtmlGeneration_ValueMustBeNumber { get { throw null; } } + internal static string InputFormatterNoEncoding { get { throw null; } } + internal static string InputFormattersAreRequired { get { throw null; } } + internal static string InvalidTypeTForActionResultOfT { get { throw null; } } + internal static string Invalid_IncludePropertyExpression { get { throw null; } } + internal static string JQueryFormValueProviderFactory_MissingClosingBracket { get { throw null; } } + internal static string KeyValuePair_BothKeyAndValueMustBePresent { get { throw null; } } + internal static string MatchAllContentTypeIsNotAllowed { get { throw null; } } + internal static string MiddewareFilter_ConfigureMethodOverload { get { throw null; } } + internal static string MiddewareFilter_NoConfigureMethod { get { throw null; } } + internal static string MiddlewareFilterBuilder_NoMiddlewareFeature { get { throw null; } } + internal static string MiddlewareFilterBuilder_NullApplicationBuilder { get { throw null; } } + internal static string MiddlewareFilterConfigurationProvider_CreateConfigureDelegate_CannotCreateType { get { throw null; } } + internal static string MiddlewareFilter_InvalidConfigureReturnType { get { throw null; } } + internal static string MiddlewareFilter_ServiceResolutionFail { get { throw null; } } + internal static string ModelBinderProvidersAreRequired { get { throw null; } } + internal static string ModelBinderUtil_ModelCannotBeNull { get { throw null; } } + internal static string ModelBinderUtil_ModelInstanceIsWrong { get { throw null; } } + internal static string ModelBinderUtil_ModelMetadataCannotBeNull { get { throw null; } } + internal static string ModelBinding_ExceededMaxModelBindingCollectionSize { get { throw null; } } + internal static string ModelBinding_ExceededMaxModelBindingRecursionDepth { get { throw null; } } + internal static string ModelBinding_MissingBindRequiredMember { get { throw null; } } + internal static string ModelBinding_MissingRequestBodyRequiredMember { get { throw null; } } + internal static string ModelBinding_NullValueNotValid { get { throw null; } } + internal static string ModelState_AttemptedValueIsInvalid { get { throw null; } } + internal static string ModelState_NonPropertyAttemptedValueIsInvalid { get { throw null; } } + internal static string ModelState_NonPropertyUnknownValueIsInvalid { get { throw null; } } + internal static string ModelState_UnknownValueIsInvalid { get { throw null; } } + internal static string ModelType_WrongType { get { throw null; } } + internal static string NoRoutesMatched { get { throw null; } } + internal static string NoRoutesMatchedForPage { get { throw null; } } + internal static string ObjectResultExecutor_MaxEnumerationExceeded { get { throw null; } } + internal static string ObjectResult_MatchAllContentType { get { throw null; } } + internal static string OutputFormatterNoMediaType { get { throw null; } } + internal static string OutputFormattersAreRequired { get { throw null; } } + internal static string PropertyOfTypeCannotBeNull { get { throw null; } } + internal static string Property_MustBeInstanceOfType { get { throw null; } } + internal static string ReferenceToNewtonsoftJsonRequired { get { throw null; } } + internal static string RelatedAssemblyAttribute_AssemblyCannotReferenceSelf { get { throw null; } } + internal static string RelatedAssemblyAttribute_CouldNotBeFound { get { throw null; } } + internal static System.Resources.ResourceManager ResourceManager { get { throw null; } } + internal static string ResponseCache_SpecifyDuration { get { throw null; } } + internal static string SerializableError_DefaultError { get { throw null; } } + internal static string TextInputFormatter_SupportedEncodingsMustNotBeEmpty { get { throw null; } } + internal static string TextOutputFormatter_SupportedEncodingsMustNotBeEmpty { get { throw null; } } + internal static string TextOutputFormatter_WriteResponseBodyAsyncNotSupported { get { throw null; } } + internal static string TypeMethodMustReturnNotNullValue { get { throw null; } } + internal static string TypeMustDeriveFromType { get { throw null; } } + internal static string UnableToFindServices { get { throw null; } } + internal static string UnexpectedJsonEnd { get { throw null; } } + internal static string UnsupportedContentType { get { throw null; } } + internal static string UrlHelper_RelativePagePathIsNotSupported { get { throw null; } } + internal static string UrlNotLocal { get { throw null; } } + internal static string ValidationProblemDescription_Title { get { throw null; } } + internal static string ValidationVisitor_ExceededMaxDepth { get { throw null; } } + internal static string ValidationVisitor_ExceededMaxDepthFix { get { throw null; } } + internal static string ValidationVisitor_ExceededMaxPropertyDepth { get { throw null; } } + internal static string ValueInterfaceAbstractOrOpenGenericTypesCannotBeActivated { get { throw null; } } + internal static string ValueProviderResult_NoConverterExists { get { throw null; } } + internal static string VaryByQueryKeys_Requires_ResponseCachingMiddleware { get { throw null; } } + internal static string VirtualFileResultExecutor_NoFileProviderConfigured { get { throw null; } } + internal static string FormatAcceptHeaderParser_ParseAcceptHeader_InvalidValues(object p0) { throw null; } + internal static string FormatActionDescriptorMustBeBasedOnControllerAction(object p0) { throw null; } + internal static string FormatActionExecutor_UnexpectedTaskInstance(object p0, object p1) { throw null; } + internal static string FormatActionExecutor_WrappedTaskInstance(object p0, object p1, object p2) { throw null; } + internal static string FormatActionInvokerFactory_CouldNotCreateInvoker(object p0) { throw null; } + internal static string FormatActionResult_ActionReturnValueCannotBeNull(object p0) { throw null; } + internal static string FormatApiController_AttributeRouteRequired(object p0, object p1) { throw null; } + internal static string FormatApiController_MultipleBodyParametersFound(object p0, object p1, object p2, object p3) { throw null; } + internal static string FormatApiConventionMethod_AmbiguousMethodName(object p0, object p1) { throw null; } + internal static string FormatApiConventionMethod_NoMethodFound(object p0, object p1) { throw null; } + internal static string FormatApiConventionMustBeStatic(object p0) { throw null; } + internal static string FormatApiConvention_UnsupportedAttributesOnConvention(object p0, object p1, object p2) { throw null; } + internal static string FormatApiExplorer_UnsupportedAction(object p0) { throw null; } + internal static string FormatApplicationAssembliesProvider_DuplicateRelatedAssembly(object p0) { throw null; } + internal static string FormatApplicationAssembliesProvider_RelatedAssemblyCannotDefineAdditional(object p0, object p1) { throw null; } + internal static string FormatApplicationPartFactory_InvalidFactoryType(object p0, object p1, object p2) { throw null; } + internal static string FormatArgument_InvalidOffsetLength(object p0, object p1) { throw null; } + internal static string FormatAsyncActionFilter_InvalidShortCircuit(object p0, object p1, object p2, object p3) { throw null; } + internal static string FormatAsyncResourceFilter_InvalidShortCircuit(object p0, object p1, object p2, object p3) { throw null; } + internal static string FormatAsyncResultFilter_InvalidShortCircuit(object p0, object p1, object p2, object p3) { throw null; } + internal static string FormatAttributeRoute_AggregateErrorMessage(object p0, object p1) { throw null; } + internal static string FormatAttributeRoute_AggregateErrorMessage_ErrorNumber(object p0, object p1, object p2) { throw null; } + internal static string FormatAttributeRoute_CannotContainParameter(object p0, object p1, object p2) { throw null; } + internal static string FormatAttributeRoute_DuplicateNames(object p0, object p1, object p2) { throw null; } + internal static string FormatAttributeRoute_DuplicateNames_Item(object p0, object p1) { throw null; } + internal static string FormatAttributeRoute_IndividualErrorMessage(object p0, object p1, object p2) { throw null; } + internal static string FormatAttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod(object p0, object p1, object p2) { throw null; } + internal static string FormatAttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod_Item(object p0, object p1, object p2) { throw null; } + internal static string FormatAttributeRoute_TokenReplacement_InvalidSyntax(object p0, object p1) { throw null; } + internal static string FormatAttributeRoute_TokenReplacement_ReplacementValueNotFound(object p0, object p1, object p2) { throw null; } + internal static string FormatAuthorizeFilter_AuthorizationPolicyCannotBeCreated(object p0, object p1) { throw null; } + internal static string FormatBinderType_MustBeIModelBinder(object p0, object p1) { throw null; } + internal static string FormatBindingSource_CannotBeComposite(object p0, object p1) { throw null; } + internal static string FormatBindingSource_CannotBeGreedy(object p0, object p1) { throw null; } + internal static string FormatCacheProfileNotFound(object p0) { throw null; } + internal static string FormatCandidateResolver_DifferentCasedReference(object p0) { throw null; } + internal static string FormatCommon_PropertyNotFound(object p0, object p1) { throw null; } + internal static string FormatComplexTypeModelBinder_NoParameterlessConstructor_ForParameter(object p0, object p1) { throw null; } + internal static string FormatComplexTypeModelBinder_NoParameterlessConstructor_ForProperty(object p0, object p1, object p2) { throw null; } + internal static string FormatComplexTypeModelBinder_NoParameterlessConstructor_ForType(object p0) { throw null; } + internal static string FormatCouldNotCreateIModelBinder(object p0) { throw null; } + internal static string FormatDefaultActionSelector_AmbiguousActions(object p0, object p1) { throw null; } + internal static string FormatFileResult_InvalidPath(object p0) { throw null; } + internal static string FormatFileResult_PathNotRooted(object p0) { throw null; } + internal static string FormatFilterFactoryAttribute_TypeMustImplementIFilter(object p0, object p1) { throw null; } + internal static string FormatFormatFormatterMappings_GetMediaTypeMappingForFormat_InvalidFormat(object p0) { throw null; } + internal static string FormatFormatterMappings_NotValidMediaType(object p0) { throw null; } + internal static string FormatFormatter_NoMediaTypes(object p0, object p1) { throw null; } + internal static string FormatFormat_NotValid(object p0) { throw null; } + internal static string FormatFormCollectionModelBinder_CannotBindToFormCollection(object p0, object p1, object p2) { throw null; } + internal static string FormatHtmlGeneration_ValueIsInvalid(object p0) { throw null; } + internal static string FormatHtmlGeneration_ValueMustBeNumber(object p0) { throw null; } + internal static string FormatInputFormatterNoEncoding(object p0) { throw null; } + internal static string FormatInputFormattersAreRequired(object p0, object p1, object p2) { throw null; } + internal static string FormatInvalidTypeTForActionResultOfT(object p0, object p1) { throw null; } + internal static string FormatInvalid_IncludePropertyExpression(object p0) { throw null; } + internal static string FormatJQueryFormValueProviderFactory_MissingClosingBracket(object p0) { throw null; } + internal static string FormatMatchAllContentTypeIsNotAllowed(object p0) { throw null; } + internal static string FormatMiddewareFilter_ConfigureMethodOverload(object p0) { throw null; } + internal static string FormatMiddewareFilter_NoConfigureMethod(object p0, object p1) { throw null; } + internal static string FormatMiddlewareFilterBuilder_NoMiddlewareFeature(object p0) { throw null; } + internal static string FormatMiddlewareFilterBuilder_NullApplicationBuilder(object p0) { throw null; } + internal static string FormatMiddlewareFilterConfigurationProvider_CreateConfigureDelegate_CannotCreateType(object p0, object p1) { throw null; } + internal static string FormatMiddlewareFilter_InvalidConfigureReturnType(object p0, object p1, object p2) { throw null; } + internal static string FormatMiddlewareFilter_ServiceResolutionFail(object p0, object p1, object p2, object p3) { throw null; } + internal static string FormatModelBinderProvidersAreRequired(object p0, object p1, object p2) { throw null; } + internal static string FormatModelBinderUtil_ModelCannotBeNull(object p0) { throw null; } + internal static string FormatModelBinderUtil_ModelInstanceIsWrong(object p0, object p1) { throw null; } + internal static string FormatModelBinding_ExceededMaxModelBindingCollectionSize(object p0, object p1, object p2, object p3, object p4) { throw null; } + internal static string FormatModelBinding_ExceededMaxModelBindingRecursionDepth(object p0, object p1, object p2, object p3) { throw null; } + internal static string FormatModelBinding_MissingBindRequiredMember(object p0) { throw null; } + internal static string FormatModelBinding_NullValueNotValid(object p0) { throw null; } + internal static string FormatModelState_AttemptedValueIsInvalid(object p0, object p1) { throw null; } + internal static string FormatModelState_NonPropertyAttemptedValueIsInvalid(object p0) { throw null; } + internal static string FormatModelState_UnknownValueIsInvalid(object p0) { throw null; } + internal static string FormatModelType_WrongType(object p0, object p1) { throw null; } + internal static string FormatNoRoutesMatchedForPage(object p0) { throw null; } + internal static string FormatObjectResultExecutor_MaxEnumerationExceeded(object p0, object p1) { throw null; } + internal static string FormatObjectResult_MatchAllContentType(object p0, object p1) { throw null; } + internal static string FormatOutputFormatterNoMediaType(object p0) { throw null; } + internal static string FormatOutputFormattersAreRequired(object p0, object p1, object p2) { throw null; } + internal static string FormatPropertyOfTypeCannotBeNull(object p0, object p1) { throw null; } + internal static string FormatProperty_MustBeInstanceOfType(object p0, object p1, object p2) { throw null; } + internal static string FormatReferenceToNewtonsoftJsonRequired(object p0, object p1, object p2, object p3, object p4) { throw null; } + internal static string FormatRelatedAssemblyAttribute_AssemblyCannotReferenceSelf(object p0, object p1) { throw null; } + internal static string FormatRelatedAssemblyAttribute_CouldNotBeFound(object p0, object p1, object p2) { throw null; } + internal static string FormatResponseCache_SpecifyDuration(object p0, object p1) { throw null; } + internal static string FormatTextInputFormatter_SupportedEncodingsMustNotBeEmpty(object p0) { throw null; } + internal static string FormatTextOutputFormatter_SupportedEncodingsMustNotBeEmpty(object p0) { throw null; } + internal static string FormatTextOutputFormatter_WriteResponseBodyAsyncNotSupported(object p0, object p1, object p2) { throw null; } + internal static string FormatTypeMethodMustReturnNotNullValue(object p0, object p1) { throw null; } + internal static string FormatTypeMustDeriveFromType(object p0, object p1) { throw null; } + internal static string FormatUnableToFindServices(object p0, object p1, object p2) { throw null; } + internal static string FormatUnsupportedContentType(object p0) { throw null; } + internal static string FormatUrlHelper_RelativePagePathIsNotSupported(object p0, object p1, object p2) { throw null; } + internal static string FormatValidationVisitor_ExceededMaxDepth(object p0, object p1, object p2) { throw null; } + internal static string FormatValidationVisitor_ExceededMaxDepthFix(object p0, object p1) { throw null; } + internal static string FormatValidationVisitor_ExceededMaxPropertyDepth(object p0, object p1, object p2, object p3) { throw null; } + internal static string FormatValueInterfaceAbstractOrOpenGenericTypesCannotBeActivated(object p0, object p1) { throw null; } + internal static string FormatValueProviderResult_NoConverterExists(object p0, object p1) { throw null; } + internal static string FormatVaryByQueryKeys_Requires_ResponseCachingMiddleware(object p0) { throw null; } + internal static string GetResourceString(string resourceKey, string defaultValue = null) { throw null; } + private static string GetResourceString(string resourceKey, string[] formatterNames) { throw null; } + } +} +namespace Microsoft.AspNetCore.Mvc.Controllers +{ + internal partial class DefaultControllerPropertyActivator : Microsoft.AspNetCore.Mvc.Controllers.IControllerPropertyActivator + { + private System.Collections.Concurrent.ConcurrentDictionary[]> _activateActions; + private static readonly System.Func[]> _getPropertiesToActivate; + private bool _initialized; + private object _initializeLock; + public DefaultControllerPropertyActivator() { } + public void Activate(Microsoft.AspNetCore.Mvc.ControllerContext context, object controller) { } + public System.Action GetActivatorDelegate(Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor actionDescriptor) { throw null; } + private static Microsoft.Extensions.Internal.PropertyActivator[] GetPropertiesToActivate(System.Type type) { throw null; } + } + internal partial interface IControllerPropertyActivator + { + void Activate(Microsoft.AspNetCore.Mvc.ControllerContext context, object controller); + System.Action GetActivatorDelegate(Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor actionDescriptor); + } +} +namespace Microsoft.AspNetCore.Mvc.Filters +{ + internal partial class DefaultFilterProvider + { + public DefaultFilterProvider() { } + public int Order { get { throw null; } } + private void ApplyFilterToContainer(object actualFilter, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata filterMetadata) { } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.Filters.FilterProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.Filters.FilterProviderContext context) { } + public void ProvideFilter(Microsoft.AspNetCore.Mvc.Filters.FilterProviderContext context, Microsoft.AspNetCore.Mvc.Filters.FilterItem filterItem) { } + } + internal readonly partial struct FilterFactoryResult + { + private readonly object _dummy; + public FilterFactoryResult(Microsoft.AspNetCore.Mvc.Filters.FilterItem[] cacheableFilters, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] filters) { throw null; } + public Microsoft.AspNetCore.Mvc.Filters.FilterItem[] CacheableFilters { get { throw null; } } + public Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] Filters { get { throw null; } } + } + internal static partial class FilterFactory + { + public static Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] CreateUncachedFilters(Microsoft.AspNetCore.Mvc.Filters.IFilterProvider[] filterProviders, Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.Filters.FilterItem[] cachedFilterItems) { throw null; } + private static Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] CreateUncachedFiltersCore(Microsoft.AspNetCore.Mvc.Filters.IFilterProvider[] filterProviders, Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.List filterItems) { throw null; } + public static Microsoft.AspNetCore.Mvc.Filters.FilterFactoryResult GetAllFilters(Microsoft.AspNetCore.Mvc.Filters.IFilterProvider[] filterProviders, Microsoft.AspNetCore.Mvc.ActionContext actionContext) { throw null; } + } + internal partial interface IResponseCacheFilter : Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata + { + } + internal partial struct FilterCursor + { + private object _dummy; + private int _dummyPrimitive; + public FilterCursor(Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] filters) { throw null; } + public Microsoft.AspNetCore.Mvc.Filters.FilterCursorItem GetNextFilter() where TFilter : class where TFilterAsync : class { throw null; } + public void Reset() { } + } + internal partial class ResponseCacheFilterExecutor + { + private int? _cacheDuration; + private Microsoft.AspNetCore.Mvc.ResponseCacheLocation? _cacheLocation; + private bool? _cacheNoStore; + private readonly Microsoft.AspNetCore.Mvc.CacheProfile _cacheProfile; + private string _cacheVaryByHeader; + private string[] _cacheVaryByQueryKeys; + public ResponseCacheFilterExecutor(Microsoft.AspNetCore.Mvc.CacheProfile cacheProfile) { } + public int Duration { get { throw null; } set { } } + public Microsoft.AspNetCore.Mvc.ResponseCacheLocation Location { get { throw null; } set { } } + public bool NoStore { get { throw null; } set { } } + public string VaryByHeader { get { throw null; } set { } } + public string[] VaryByQueryKeys { get { throw null; } set { } } + public void Execute(Microsoft.AspNetCore.Mvc.Filters.FilterContext context) { } + } + internal readonly partial struct FilterCursorItem + { + private readonly TFilter _Filter_k__BackingField; + private readonly TFilterAsync _FilterAsync_k__BackingField; + private readonly int _dummyPrimitive; + public FilterCursorItem(TFilter filter, TFilterAsync filterAsync) { throw null; } + public TFilter Filter { get { throw null; } } + public TFilterAsync FilterAsync { get { throw null; } } + } +} +namespace Microsoft.AspNetCore.Mvc.Formatters +{ + internal static partial class MediaTypeHeaderValues + { + public static readonly Microsoft.Net.Http.Headers.MediaTypeHeaderValue ApplicationAnyJsonSyntax; + public static readonly Microsoft.Net.Http.Headers.MediaTypeHeaderValue ApplicationAnyXmlSyntax; + public static readonly Microsoft.Net.Http.Headers.MediaTypeHeaderValue ApplicationJson; + public static readonly Microsoft.Net.Http.Headers.MediaTypeHeaderValue ApplicationJsonPatch; + public static readonly Microsoft.Net.Http.Headers.MediaTypeHeaderValue ApplicationXml; + public static readonly Microsoft.Net.Http.Headers.MediaTypeHeaderValue TextJson; + public static readonly Microsoft.Net.Http.Headers.MediaTypeHeaderValue TextXml; + } + internal static partial class ResponseContentTypeHelper + { + public static void ResolveContentTypeAndEncoding(string actionResultContentType, string httpResponseContentType, string defaultContentType, out string resolvedContentType, out System.Text.Encoding resolvedContentTypeEncoding) { throw null; } + } +} +namespace Microsoft.AspNetCore.Mvc.Infrastructure +{ + internal abstract partial class ActionMethodExecutor + { + private static readonly Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor[] Executors; + protected ActionMethodExecutor() { } + protected abstract bool CanExecute(Microsoft.Extensions.Internal.ObjectMethodExecutor executor); + private Microsoft.AspNetCore.Mvc.IActionResult ConvertToActionResult(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, object returnValue, System.Type declaredType) { throw null; } + private static void EnsureActionResultNotNull(Microsoft.Extensions.Internal.ObjectMethodExecutor executor, Microsoft.AspNetCore.Mvc.IActionResult actionResult) { } + public abstract System.Threading.Tasks.ValueTask Execute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.Extensions.Internal.ObjectMethodExecutor executor, object controller, object[] arguments); + public static Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor GetExecutor(Microsoft.Extensions.Internal.ObjectMethodExecutor executor) { throw null; } + private partial class AwaitableObjectResultExecutor : Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor + { + public AwaitableObjectResultExecutor() { } + protected override bool CanExecute(Microsoft.Extensions.Internal.ObjectMethodExecutor executor) { throw null; } + public override System.Threading.Tasks.ValueTask Execute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.Extensions.Internal.ObjectMethodExecutor executor, object controller, object[] arguments) { throw null; } + } + private partial class AwaitableResultExecutor : Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor + { + public AwaitableResultExecutor() { } + protected override bool CanExecute(Microsoft.Extensions.Internal.ObjectMethodExecutor executor) { throw null; } + public override System.Threading.Tasks.ValueTask Execute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.Extensions.Internal.ObjectMethodExecutor executor, object controller, object[] arguments) { throw null; } + } + private partial class SyncActionResultExecutor : Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor + { + public SyncActionResultExecutor() { } + protected override bool CanExecute(Microsoft.Extensions.Internal.ObjectMethodExecutor executor) { throw null; } + public override System.Threading.Tasks.ValueTask Execute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.Extensions.Internal.ObjectMethodExecutor executor, object controller, object[] arguments) { throw null; } + } + private partial class SyncObjectResultExecutor : Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor + { + public SyncObjectResultExecutor() { } + protected override bool CanExecute(Microsoft.Extensions.Internal.ObjectMethodExecutor executor) { throw null; } + public override System.Threading.Tasks.ValueTask Execute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.Extensions.Internal.ObjectMethodExecutor executor, object controller, object[] arguments) { throw null; } + } + private partial class TaskOfActionResultExecutor : Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor + { + public TaskOfActionResultExecutor() { } + protected override bool CanExecute(Microsoft.Extensions.Internal.ObjectMethodExecutor executor) { throw null; } + public override System.Threading.Tasks.ValueTask Execute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.Extensions.Internal.ObjectMethodExecutor executor, object controller, object[] arguments) { throw null; } + } + private partial class TaskOfIActionResultExecutor : Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor + { + public TaskOfIActionResultExecutor() { } + protected override bool CanExecute(Microsoft.Extensions.Internal.ObjectMethodExecutor executor) { throw null; } + public override System.Threading.Tasks.ValueTask Execute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.Extensions.Internal.ObjectMethodExecutor executor, object controller, object[] arguments) { throw null; } + } + private partial class TaskResultExecutor : Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor + { + public TaskResultExecutor() { } + protected override bool CanExecute(Microsoft.Extensions.Internal.ObjectMethodExecutor executor) { throw null; } + public override System.Threading.Tasks.ValueTask Execute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.Extensions.Internal.ObjectMethodExecutor executor, object controller, object[] arguments) { throw null; } + } + private partial class VoidResultExecutor : Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor + { + public VoidResultExecutor() { } + protected override bool CanExecute(Microsoft.Extensions.Internal.ObjectMethodExecutor executor) { throw null; } + public override System.Threading.Tasks.ValueTask Execute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.Extensions.Internal.ObjectMethodExecutor executor, object controller, object[] arguments) { throw null; } + } + } + internal partial class ControllerActionInvokerCacheEntry + { + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor _ActionMethodExecutor_k__BackingField; + private readonly Microsoft.AspNetCore.Mvc.Filters.FilterItem[] _CachedFilters_k__BackingField; + private readonly Microsoft.AspNetCore.Mvc.Controllers.ControllerBinderDelegate _ControllerBinderDelegate_k__BackingField; + private readonly System.Func _ControllerFactory_k__BackingField; + private readonly System.Action _ControllerReleaser_k__BackingField; + private readonly Microsoft.Extensions.Internal.ObjectMethodExecutor _ObjectMethodExecutor_k__BackingField; + internal ControllerActionInvokerCacheEntry(Microsoft.AspNetCore.Mvc.Filters.FilterItem[] cachedFilters, System.Func controllerFactory, System.Action controllerReleaser, Microsoft.AspNetCore.Mvc.Controllers.ControllerBinderDelegate controllerBinderDelegate, Microsoft.Extensions.Internal.ObjectMethodExecutor objectMethodExecutor, Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor actionMethodExecutor) { } + internal Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor ActionMethodExecutor { get { throw null; } } + public Microsoft.AspNetCore.Mvc.Filters.FilterItem[] CachedFilters { get { throw null; } } + public Microsoft.AspNetCore.Mvc.Controllers.ControllerBinderDelegate ControllerBinderDelegate { get { throw null; } } + public System.Func ControllerFactory { get { throw null; } } + public System.Action ControllerReleaser { get { throw null; } } + internal Microsoft.Extensions.Internal.ObjectMethodExecutor ObjectMethodExecutor { get { throw null; } } + } + internal partial class ControllerActionInvokerCache + { + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider _collectionProvider; + private readonly Microsoft.AspNetCore.Mvc.Controllers.IControllerFactoryProvider _controllerFactoryProvider; + private volatile Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvokerCache.InnerCache _currentCache; + private readonly Microsoft.AspNetCore.Mvc.Filters.IFilterProvider[] _filterProviders; + private readonly Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory _modelBinderFactory; + private readonly Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider _modelMetadataProvider; + private readonly Microsoft.AspNetCore.Mvc.MvcOptions _mvcOptions; + private readonly Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder _parameterBinder; + public ControllerActionInvokerCache(Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider collectionProvider, Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder parameterBinder, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider, System.Collections.Generic.IEnumerable filterProviders, Microsoft.AspNetCore.Mvc.Controllers.IControllerFactoryProvider factoryProvider, Microsoft.Extensions.Options.IOptions mvcOptions) { } + private Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvokerCache.InnerCache CurrentCache { get { throw null; } } + public (Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvokerCacheEntry cacheEntry, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] filters) GetCachedResult(Microsoft.AspNetCore.Mvc.ControllerContext controllerContext) { throw null; } + private partial class InnerCache + { + private readonly System.Collections.Concurrent.ConcurrentDictionary _Entries_k__BackingField; + private readonly int _Version_k__BackingField; + public InnerCache(int version) { } + public System.Collections.Concurrent.ConcurrentDictionary Entries { get { throw null; } } + public int Version { get { throw null; } } + } + } + internal partial class MvcOptionsConfigureCompatibilityOptions : Microsoft.AspNetCore.Mvc.Infrastructure.ConfigureCompatibilityOptions + { + public MvcOptionsConfigureCompatibilityOptions(Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.Extensions.Options.IOptions compatibilityOptions) : base(loggerFactory, compatibilityOptions) { } + protected override System.Collections.Generic.IReadOnlyDictionary DefaultValues { get { throw null; } } + } + internal partial class DefaultActionDescriptorCollectionProvider : Microsoft.AspNetCore.Mvc.Infrastructure.ActionDescriptorCollectionProvider + { + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorChangeProvider[] _actionDescriptorChangeProviders; + private readonly Microsoft.AspNetCore.Mvc.Abstractions.IActionDescriptorProvider[] _actionDescriptorProviders; + private System.Threading.CancellationTokenSource _cancellationTokenSource; + private Microsoft.Extensions.Primitives.IChangeToken _changeToken; + private Microsoft.AspNetCore.Mvc.Infrastructure.ActionDescriptorCollection _collection; + private readonly object _lock; + private int _version; + public DefaultActionDescriptorCollectionProvider(System.Collections.Generic.IEnumerable actionDescriptorProviders, System.Collections.Generic.IEnumerable actionDescriptorChangeProviders) { } + public override Microsoft.AspNetCore.Mvc.Infrastructure.ActionDescriptorCollection ActionDescriptors { get { throw null; } } + public override Microsoft.Extensions.Primitives.IChangeToken GetChangeToken() { throw null; } + private Microsoft.Extensions.Primitives.IChangeToken GetCompositeChangeToken() { throw null; } + private void Initialize() { } + private void UpdateCollection() { } + } + internal partial class ControllerActionInvokerProvider + { + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor _actionContextAccessor; + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvokerCache _controllerActionInvokerCache; + private readonly System.Diagnostics.DiagnosticListener _diagnosticListener; + private readonly Microsoft.Extensions.Logging.ILogger _logger; + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper _mapper; + private readonly int _maxModelValidationErrors; + private readonly System.Collections.Generic.IReadOnlyList _valueProviderFactories; + public ControllerActionInvokerProvider(Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvokerCache controllerActionInvokerCache, Microsoft.Extensions.Options.IOptions optionsAccessor, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper) { } + public ControllerActionInvokerProvider(Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvokerCache controllerActionInvokerCache, Microsoft.Extensions.Options.IOptions optionsAccessor, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor actionContextAccessor) { } + public int Order { get { throw null; } } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.Abstractions.ActionInvokerProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.Abstractions.ActionInvokerProviderContext context) { } + } + internal partial class ActionSelector : Microsoft.AspNetCore.Mvc.Infrastructure.IActionSelector + { + private readonly Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintCache _actionConstraintCache; + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider _actionDescriptorCollectionProvider; + private Microsoft.AspNetCore.Mvc.Infrastructure.ActionSelectionTable _cache; + private readonly Microsoft.Extensions.Logging.ILogger _logger; + public ActionSelector(Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider actionDescriptorCollectionProvider, Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintCache actionConstraintCache, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + private Microsoft.AspNetCore.Mvc.Infrastructure.ActionSelectionTable Current { get { throw null; } } + private System.Collections.Generic.IReadOnlyList EvaluateActionConstraints(Microsoft.AspNetCore.Routing.RouteContext context, System.Collections.Generic.IReadOnlyList actions) { throw null; } + private System.Collections.Generic.IReadOnlyList EvaluateActionConstraintsCore(Microsoft.AspNetCore.Routing.RouteContext context, System.Collections.Generic.IReadOnlyList candidates, int? startingOrder) { throw null; } + private System.Collections.Generic.IReadOnlyList SelectBestActions(System.Collections.Generic.IReadOnlyList actions) { throw null; } + public Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor SelectBestCandidate(Microsoft.AspNetCore.Routing.RouteContext context, System.Collections.Generic.IReadOnlyList candidates) { throw null; } + public System.Collections.Generic.IReadOnlyList SelectCandidates(Microsoft.AspNetCore.Routing.RouteContext context) { throw null; } + } + internal partial class CopyOnWriteList : System.Collections.Generic.IList + { + private System.Collections.Generic.List _copy; + private readonly System.Collections.Generic.IReadOnlyList _source; + public CopyOnWriteList(System.Collections.Generic.IReadOnlyList source) { } + public int Count { get { throw null; } } + public bool IsReadOnly { get { throw null; } } + public T this[int index] { get { throw null; } set { } } + private System.Collections.Generic.IReadOnlyList Readable { get { throw null; } } + private System.Collections.Generic.List Writable { get { throw null; } } + public void Add(T item) { } + public void Clear() { } + public bool Contains(T item) { throw null; } + public void CopyTo(T[] array, int arrayIndex) { } + public System.Collections.Generic.IEnumerator GetEnumerator() { throw null; } + public int IndexOf(T item) { throw null; } + public void Insert(int index, T item) { } + public bool Remove(T item) { throw null; } + public void RemoveAt(int index) { } + System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } + } + public partial class ActionContextAccessor : Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor + { + internal static readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor Null; + } + internal static partial class ParameterDefaultValues + { + private static object GetParameterDefaultValue(System.Reflection.ParameterInfo parameterInfo) { throw null; } + public static object[] GetParameterDefaultValues(System.Reflection.MethodInfo methodInfo) { throw null; } + public static bool TryGetDeclaredParameterDefaultValue(System.Reflection.ParameterInfo parameterInfo, out object defaultValue) { throw null; } + } + internal partial interface ITypeActivatorCache + { + TInstance CreateInstance(System.IServiceProvider serviceProvider, System.Type optionType); + } + internal partial class NonDisposableStream : System.IO.Stream + { + private readonly System.IO.Stream _innerStream; + public NonDisposableStream(System.IO.Stream innerStream) { } + public override bool CanRead { get { throw null; } } + public override bool CanSeek { get { throw null; } } + public override bool CanTimeout { get { throw null; } } + public override bool CanWrite { get { throw null; } } + private System.IO.Stream InnerStream { get { throw null; } } + public override long Length { get { throw null; } } + public override long Position { get { throw null; } set { } } + public override int ReadTimeout { get { throw null; } set { } } + public override int WriteTimeout { get { throw null; } set { } } + public override System.IAsyncResult BeginRead(byte[] buffer, int offset, int count, System.AsyncCallback callback, object state) { throw null; } + public override System.IAsyncResult BeginWrite(byte[] buffer, int offset, int count, System.AsyncCallback callback, object state) { throw null; } + public override void Close() { } + public override System.Threading.Tasks.Task CopyToAsync(System.IO.Stream destination, int bufferSize, System.Threading.CancellationToken cancellationToken) { throw null; } + protected override void Dispose(bool disposing) { } + public override int EndRead(System.IAsyncResult asyncResult) { throw null; } + public override void EndWrite(System.IAsyncResult asyncResult) { } + public override void Flush() { } + public override System.Threading.Tasks.Task FlushAsync(System.Threading.CancellationToken cancellationToken) { throw null; } + public override int Read(byte[] buffer, int offset, int count) { throw null; } + public override System.Threading.Tasks.Task ReadAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } + public override int ReadByte() { throw null; } + public override long Seek(long offset, System.IO.SeekOrigin origin) { throw null; } + public override void SetLength(long value) { } + public override void Write(byte[] buffer, int offset, int count) { } + public override System.Threading.Tasks.Task WriteAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } + public override void WriteByte(byte value) { } + } + internal partial class ActionSelectionTable + { + private readonly System.Collections.Generic.Dictionary> _OrdinalEntries_k__BackingField; + private readonly System.Collections.Generic.Dictionary> _OrdinalIgnoreCaseEntries_k__BackingField; + private readonly string[] _RouteKeys_k__BackingField; + private readonly int _Version_k__BackingField; + private ActionSelectionTable(int version, string[] routeKeys, System.Collections.Generic.Dictionary> ordinalEntries, System.Collections.Generic.Dictionary> ordinalIgnoreCaseEntries) { } + private System.Collections.Generic.Dictionary> OrdinalEntries { get { throw null; } } + private System.Collections.Generic.Dictionary> OrdinalIgnoreCaseEntries { get { throw null; } } + private string[] RouteKeys { get { throw null; } } + public int Version { get { throw null; } } + public static Microsoft.AspNetCore.Mvc.Infrastructure.ActionSelectionTable Create(Microsoft.AspNetCore.Mvc.Infrastructure.ActionDescriptorCollection actions) { throw null; } + public static Microsoft.AspNetCore.Mvc.Infrastructure.ActionSelectionTable Create(System.Collections.Generic.IEnumerable endpoints) { throw null; } + private static Microsoft.AspNetCore.Mvc.Infrastructure.ActionSelectionTable CreateCore(int version, System.Collections.Generic.IEnumerable items, System.Func> getRouteKeys, System.Func getRouteValue) { throw null; } + public System.Collections.Generic.IReadOnlyList Select(Microsoft.AspNetCore.Routing.RouteValueDictionary values) { throw null; } + } + internal abstract partial class ResourceInvoker + { + protected readonly Microsoft.AspNetCore.Mvc.ActionContext _actionContext; + protected readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor _actionContextAccessor; + private Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.AuthorizationFilterContextSealed _authorizationContext; + protected Microsoft.AspNetCore.Mvc.Filters.FilterCursor _cursor; + protected readonly System.Diagnostics.DiagnosticListener _diagnosticListener; + private Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.ExceptionContextSealed _exceptionContext; + protected readonly Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] _filters; + protected object _instance; + protected readonly Microsoft.Extensions.Logging.ILogger _logger; + protected readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper _mapper; + private Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.ResourceExecutedContextSealed _resourceExecutedContext; + private Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.ResourceExecutingContextSealed _resourceExecutingContext; + protected Microsoft.AspNetCore.Mvc.IActionResult _result; + private Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.ResultExecutedContextSealed _resultExecutedContext; + private Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.ResultExecutingContextSealed _resultExecutingContext; + protected readonly System.Collections.Generic.IList _valueProviderFactories; + public ResourceInvoker(System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor actionContextAccessor, Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] filters, System.Collections.Generic.IList valueProviderFactories) { } + private System.Threading.Tasks.Task InvokeAlwaysRunResultFilters() { throw null; } + public virtual System.Threading.Tasks.Task InvokeAsync() { throw null; } + private System.Threading.Tasks.Task InvokeFilterPipelineAsync() { throw null; } + protected abstract System.Threading.Tasks.Task InvokeInnerFilterAsync(); + private System.Threading.Tasks.Task InvokeNextExceptionFilterAsync() { throw null; } + private System.Threading.Tasks.Task InvokeNextResourceFilter() { throw null; } + private System.Threading.Tasks.Task InvokeNextResourceFilterAwaitedAsync() { throw null; } + private System.Threading.Tasks.Task InvokeNextResultFilterAsync() where TFilter : class, Microsoft.AspNetCore.Mvc.Filters.IResultFilter where TFilterAsync : class, Microsoft.AspNetCore.Mvc.Filters.IAsyncResultFilter { throw null; } + private System.Threading.Tasks.Task InvokeNextResultFilterAwaitedAsync() where TFilter : class, Microsoft.AspNetCore.Mvc.Filters.IResultFilter where TFilterAsync : class, Microsoft.AspNetCore.Mvc.Filters.IAsyncResultFilter { throw null; } + protected virtual System.Threading.Tasks.Task InvokeResultAsync(Microsoft.AspNetCore.Mvc.IActionResult result) { throw null; } + private System.Threading.Tasks.Task InvokeResultFilters() { throw null; } + private System.Threading.Tasks.Task Next(ref Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.State next, ref Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.Scope scope, ref object state, ref bool isCompleted) { throw null; } + protected abstract void ReleaseResources(); + private System.Threading.Tasks.Task ResultNext(ref Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.State next, ref Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.Scope scope, ref object state, ref bool isCompleted) where TFilter : class, Microsoft.AspNetCore.Mvc.Filters.IResultFilter where TFilterAsync : class, Microsoft.AspNetCore.Mvc.Filters.IAsyncResultFilter { throw null; } + private static void Rethrow(Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.ExceptionContextSealed context) { } + private static void Rethrow(Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.ResourceExecutedContextSealed context) { } + private static void Rethrow(Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.ResultExecutedContextSealed context) { } + private sealed partial class AuthorizationFilterContextSealed + { + public AuthorizationFilterContextSealed(Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IList filters) { } + } + private sealed partial class ExceptionContextSealed + { + public ExceptionContextSealed(Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IList filters) { } + } + private static partial class FilterTypeConstants + { + public const string ActionFilter = "Action Filter"; + public const string AlwaysRunResultFilter = "Always Run Result Filter"; + public const string AuthorizationFilter = "Authorization Filter"; + public const string ExceptionFilter = "Exception Filter"; + public const string ResourceFilter = "Resource Filter"; + public const string ResultFilter = "Result Filter"; + } + private sealed partial class ResourceExecutedContextSealed + { + public ResourceExecutedContextSealed(Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IList filters) { } + } + private sealed partial class ResourceExecutingContextSealed + { + public ResourceExecutingContextSealed(Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IList filters, System.Collections.Generic.IList valueProviderFactories) { } + } + private sealed partial class ResultExecutedContextSealed + { + public ResultExecutedContextSealed(Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IList filters, Microsoft.AspNetCore.Mvc.IActionResult result, object controller) { } + } + private sealed partial class ResultExecutingContextSealed + { + public ResultExecutingContextSealed(Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IList filters, Microsoft.AspNetCore.Mvc.IActionResult result, object controller) { } + } + private enum Scope + { + Invoker = 0, + Resource = 1, + Exception = 2, + Result = 3, + } + private enum State + { + InvokeBegin = 0, + AuthorizationBegin = 1, + AuthorizationNext = 2, + AuthorizationAsyncBegin = 3, + AuthorizationAsyncEnd = 4, + AuthorizationSync = 5, + AuthorizationShortCircuit = 6, + AuthorizationEnd = 7, + ResourceBegin = 8, + ResourceNext = 9, + ResourceAsyncBegin = 10, + ResourceAsyncEnd = 11, + ResourceSyncBegin = 12, + ResourceSyncEnd = 13, + ResourceShortCircuit = 14, + ResourceInside = 15, + ResourceInsideEnd = 16, + ResourceEnd = 17, + ExceptionBegin = 18, + ExceptionNext = 19, + ExceptionAsyncBegin = 20, + ExceptionAsyncResume = 21, + ExceptionAsyncEnd = 22, + ExceptionSyncBegin = 23, + ExceptionSyncEnd = 24, + ExceptionInside = 25, + ExceptionHandled = 26, + ExceptionEnd = 27, + ActionBegin = 28, + ActionEnd = 29, + ResultBegin = 30, + ResultNext = 31, + ResultAsyncBegin = 32, + ResultAsyncEnd = 33, + ResultSyncBegin = 34, + ResultSyncEnd = 35, + ResultInside = 36, + ResultEnd = 37, + InvokeEnd = 38, + } + } +} +namespace Microsoft.AspNetCore.Mvc.ModelBinding +{ + internal static partial class PropertyValueSetter + { + private static readonly System.Reflection.MethodInfo CallPropertyAddRangeOpenGenericMethod; + private static void CallPropertyAddRange(object target, object source) { } + public static void SetValue(Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata metadata, object instance, object value) { } + } + internal static partial class ModelBindingHelper + { + public static bool CanGetCompatibleCollection(Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext bindingContext) { throw null; } + internal static TModel CastOrDefault(object model) { throw null; } + public static void ClearValidationStateForModel(Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata modelMetadata, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary modelState, string modelKey) { } + public static void ClearValidationStateForModel(System.Type modelType, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary modelState, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, string modelKey) { } + private static object ConvertSimpleType(object value, System.Type destinationType, System.Globalization.CultureInfo culture) { throw null; } + public static object ConvertTo(object value, System.Type type, System.Globalization.CultureInfo culture) { throw null; } + public static T ConvertTo(object value, System.Globalization.CultureInfo culture) { throw null; } + private static System.Collections.Generic.List CreateList(int? capacity) { throw null; } + public static System.Collections.Generic.ICollection GetCompatibleCollection(Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext bindingContext) { throw null; } + public static System.Collections.Generic.ICollection GetCompatibleCollection(Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext bindingContext, int capacity) { throw null; } + private static System.Collections.Generic.ICollection GetCompatibleCollection(Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext bindingContext, int? capacity) { throw null; } + private static System.Linq.Expressions.Expression> GetPredicateExpression(System.Linq.Expressions.Expression> expression) { throw null; } + public static System.Linq.Expressions.Expression> GetPropertyFilterExpression(System.Linq.Expressions.Expression>[] expressions) { throw null; } + internal static string GetPropertyName(System.Linq.Expressions.Expression expression) { throw null; } + public static System.Threading.Tasks.Task TryUpdateModelAsync(object model, System.Type modelType, string prefix, Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider valueProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IObjectModelValidator objectModelValidator) { throw null; } + public static System.Threading.Tasks.Task TryUpdateModelAsync(object model, System.Type modelType, string prefix, Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider valueProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IObjectModelValidator objectModelValidator, System.Func propertyFilter) { throw null; } + public static System.Threading.Tasks.Task TryUpdateModelAsync(TModel model, string prefix, Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider valueProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IObjectModelValidator objectModelValidator) where TModel : class { throw null; } + public static System.Threading.Tasks.Task TryUpdateModelAsync(TModel model, string prefix, Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider valueProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IObjectModelValidator objectModelValidator, System.Func propertyFilter) where TModel : class { throw null; } + public static System.Threading.Tasks.Task TryUpdateModelAsync(TModel model, string prefix, Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider valueProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IObjectModelValidator objectModelValidator, params System.Linq.Expressions.Expression>[] includeExpressions) where TModel : class { throw null; } + private static System.Type UnwrapNullableType(System.Type destinationType) { throw null; } + private static object UnwrapPossibleArrayType(object value, System.Type destinationType, System.Globalization.CultureInfo culture) { throw null; } + } +} +namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation +{ + internal partial class DefaultModelValidatorProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IMetadataBasedModelValidatorProvider + { + public DefaultModelValidatorProvider() { } + public void CreateValidators(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidatorProviderContext context) { } + public bool HasValidators(System.Type modelType, System.Collections.Generic.IList validatorMetadata) { throw null; } + } + internal partial class HasValidatorsValidationMetadataProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IMetadataDetailsProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IValidationMetadataProvider + { + private readonly bool _hasOnlyMetadataBasedValidators; + private readonly Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IMetadataBasedModelValidatorProvider[] _validatorProviders; + public HasValidatorsValidationMetadataProvider(System.Collections.Generic.IList modelValidatorProviders) { } + public void CreateValidationMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ValidationMetadataProviderContext context) { } + } +} +namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata +{internal partial class DefaultBindingMetadataProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IBindingMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IMetadataDetailsProvider + { + public DefaultBindingMetadataProvider() { } + public void CreateBindingMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.BindingMetadataProviderContext context) { } + private static Microsoft.AspNetCore.Mvc.ModelBinding.BindingBehaviorAttribute FindBindingBehavior(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.BindingMetadataProviderContext context) { throw null; } + private partial class CompositePropertyFilterProvider + { + private readonly System.Collections.Generic.IEnumerable _providers; + public CompositePropertyFilterProvider(System.Collections.Generic.IEnumerable providers) { } + public System.Func PropertyFilter { get { throw null; } } + private System.Func CreatePropertyFilter() { throw null; } + } + } + internal partial class DefaultCompositeMetadataDetailsProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IBindingMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ICompositeMetadataDetailsProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IDisplayMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IMetadataDetailsProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IValidationMetadataProvider + { + private readonly System.Collections.Generic.IEnumerable _providers; + public DefaultCompositeMetadataDetailsProvider(System.Collections.Generic.IEnumerable providers) { } + public void CreateBindingMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.BindingMetadataProviderContext context) { } + public void CreateDisplayMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DisplayMetadataProviderContext context) { } + public void CreateValidationMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ValidationMetadataProviderContext context) { } + } + internal partial class DefaultValidationMetadataProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IMetadataDetailsProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IValidationMetadataProvider + { + public DefaultValidationMetadataProvider() { } + public void CreateValidationMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ValidationMetadataProviderContext context) { } + } +} +namespace Microsoft.AspNetCore.Internal +{ + internal partial class ChunkingCookieManager + { + private const string ChunkCountPrefix = "chunks-"; + private const string ChunkKeySuffix = "C"; + public const int DefaultChunkSize = 4050; + private int? _ChunkSize_k__BackingField; + private bool _ThrowForPartialCookies_k__BackingField; + public ChunkingCookieManager() { } + public int? ChunkSize { get { throw null; } set { } } + public bool ThrowForPartialCookies { get { throw null; } set { } } + public void AppendResponseCookie(Microsoft.AspNetCore.Http.HttpContext context, string key, string value, Microsoft.AspNetCore.Http.CookieOptions options) { } + public void DeleteCookie(Microsoft.AspNetCore.Http.HttpContext context, string key, Microsoft.AspNetCore.Http.CookieOptions options) { } + public string GetRequestCookie(Microsoft.AspNetCore.Http.HttpContext context, string key) { throw null; } + private static int ParseChunksCount(string value) { throw null; } + } +} +namespace Microsoft.AspNetCore.Mvc +{ + internal partial class ApiDescriptionActionData + { + private string _GroupName_k__BackingField; + public ApiDescriptionActionData() { } + public string GroupName { get { throw null; } set { } } + } +} +namespace Microsoft.AspNetCore.Mvc.Routing +{ + internal static partial class ViewEnginePath + { + private const string CurrentDirectoryToken = "."; + private const string ParentDirectoryToken = ".."; + public static readonly char[] PathSeparators; + public static string CombinePath(string first, string second) { throw null; } + public static string ResolvePath(string path) { throw null; } + } + internal static partial class NormalizedRouteValue + { + public static string GetNormalizedRouteValue(Microsoft.AspNetCore.Mvc.ActionContext context, string key) { throw null; } + } + internal partial class ControllerActionEndpointDataSource : Microsoft.AspNetCore.Mvc.Routing.ActionEndpointDataSourceBase + { + private readonly Microsoft.AspNetCore.Mvc.Routing.ActionEndpointFactory _endpointFactory; + private int _order; + private readonly System.Collections.Generic.List _routes; + private bool _CreateInertEndpoints_k__BackingField; + private readonly Microsoft.AspNetCore.Builder.ControllerActionEndpointConventionBuilder _DefaultBuilder_k__BackingField; + public ControllerActionEndpointDataSource(Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider actions, Microsoft.AspNetCore.Mvc.Routing.ActionEndpointFactory endpointFactory) : base (default(Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider)) { } + public bool CreateInertEndpoints { get { throw null; } set { } } + public Microsoft.AspNetCore.Builder.ControllerActionEndpointConventionBuilder DefaultBuilder { get { throw null; } } + public Microsoft.AspNetCore.Builder.ControllerActionEndpointConventionBuilder AddRoute(string routeName, string pattern, Microsoft.AspNetCore.Routing.RouteValueDictionary defaults, System.Collections.Generic.IDictionary constraints, Microsoft.AspNetCore.Routing.RouteValueDictionary dataTokens) { throw null; } + protected override System.Collections.Generic.List CreateEndpoints(System.Collections.Generic.IReadOnlyList actions, System.Collections.Generic.IReadOnlyList> conventions) { throw null; } + } + internal readonly partial struct ConventionalRouteEntry + { + private readonly object _dummy; + private readonly int _dummyPrimitive; + public ConventionalRouteEntry(string routeName, string pattern, Microsoft.AspNetCore.Routing.RouteValueDictionary defaults, System.Collections.Generic.IDictionary constraints, Microsoft.AspNetCore.Routing.RouteValueDictionary dataTokens, int order, System.Collections.Generic.List> conventions) { throw null; } + } + internal partial class ActionConstraintMatcherPolicy : Microsoft.AspNetCore.Routing.MatcherPolicy, Microsoft.AspNetCore.Routing.Matching.IEndpointSelectorPolicy + { + private static readonly System.Collections.Generic.IReadOnlyList EmptyEndpoints; + internal static readonly Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor NonAction; + private readonly Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintCache _actionConstraintCache; + public ActionConstraintMatcherPolicy(Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintCache actionConstraintCache) { } + public override int Order { get { throw null; } } + public bool AppliesToEndpoints(System.Collections.Generic.IReadOnlyList endpoints) { throw null; } + public System.Threading.Tasks.Task ApplyAsync(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Routing.Matching.CandidateSet candidateSet) { throw null; } + private System.Collections.Generic.IReadOnlyList> EvaluateActionConstraints(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Routing.Matching.CandidateSet candidateSet) { throw null; } + private System.Collections.Generic.IReadOnlyList> EvaluateActionConstraintsCore(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Routing.Matching.CandidateSet candidateSet, System.Collections.Generic.IReadOnlyList> items, int? startingOrder) { throw null; } + } + internal abstract partial class ActionEndpointDataSourceBase : Microsoft.AspNetCore.Routing.EndpointDataSource, System.IDisposable + { + protected readonly System.Collections.Generic.List> Conventions; + protected readonly object Lock; + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider _actions; + private System.Threading.CancellationTokenSource _cancellationTokenSource; + private Microsoft.Extensions.Primitives.IChangeToken _changeToken; + private System.IDisposable _disposable; + private System.Collections.Generic.List _endpoints; + public ActionEndpointDataSourceBase(Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider actions) { } + public override System.Collections.Generic.IReadOnlyList Endpoints { get { throw null; } } + protected abstract System.Collections.Generic.List CreateEndpoints(System.Collections.Generic.IReadOnlyList actions, System.Collections.Generic.IReadOnlyList> conventions); + public void Dispose() { } + public override Microsoft.Extensions.Primitives.IChangeToken GetChangeToken() { throw null; } + private void Initialize() { } + protected void Subscribe() { } + private void UpdateEndpoints() { } + } + internal partial class ActionEndpointFactory + { + private readonly Microsoft.AspNetCore.Http.RequestDelegate _requestDelegate; + private readonly Microsoft.AspNetCore.Routing.Patterns.RoutePatternTransformer _routePatternTransformer; + public ActionEndpointFactory(Microsoft.AspNetCore.Routing.Patterns.RoutePatternTransformer routePatternTransformer) { } + private void AddActionDataToBuilder(Microsoft.AspNetCore.Builder.EndpointBuilder builder, System.Collections.Generic.HashSet routeNames, Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor action, string routeName, Microsoft.AspNetCore.Routing.RouteValueDictionary dataTokens, bool suppressLinkGeneration, bool suppressPathMatching, System.Collections.Generic.IReadOnlyList> conventions, System.Collections.Generic.IReadOnlyList> perRouteConventions) { } + public void AddConventionalLinkGenerationRoute(System.Collections.Generic.List endpoints, System.Collections.Generic.HashSet routeNames, System.Collections.Generic.HashSet keys, Microsoft.AspNetCore.Mvc.Routing.ConventionalRouteEntry route, System.Collections.Generic.IReadOnlyList> conventions) { } + public void AddEndpoints(System.Collections.Generic.List endpoints, System.Collections.Generic.HashSet routeNames, Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor action, System.Collections.Generic.IReadOnlyList routes, System.Collections.Generic.IReadOnlyList> conventions, bool createInertEndpoints) { } + private static Microsoft.AspNetCore.Http.RequestDelegate CreateRequestDelegate() { throw null; } + private static (Microsoft.AspNetCore.Routing.Patterns.RoutePattern resolvedRoutePattern, System.Collections.Generic.IDictionary resolvedRequiredValues) ResolveDefaultsAndRequiredValues(Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor action, Microsoft.AspNetCore.Routing.Patterns.RoutePattern attributeRoutePattern) { throw null; } + private partial class InertEndpointBuilder : Microsoft.AspNetCore.Builder.EndpointBuilder + { + public InertEndpointBuilder() { } + public override Microsoft.AspNetCore.Http.Endpoint Build() { throw null; } + } + } + internal partial class DynamicControllerEndpointSelector + { + private readonly Microsoft.AspNetCore.Routing.DataSourceDependentCache> _cache; + private readonly Microsoft.AspNetCore.Routing.EndpointDataSource _dataSource; + public DynamicControllerEndpointSelector(Microsoft.AspNetCore.Mvc.Routing.ControllerActionEndpointDataSource dataSource) { } + protected DynamicControllerEndpointSelector(Microsoft.AspNetCore.Routing.EndpointDataSource dataSource) { } + private Microsoft.AspNetCore.Mvc.Infrastructure.ActionSelectionTable Table { get { throw null; } } + public void Dispose() { } + private static Microsoft.AspNetCore.Mvc.Infrastructure.ActionSelectionTable Initialize(System.Collections.Generic.IReadOnlyList endpoints) { throw null; } + public System.Collections.Generic.IReadOnlyList SelectEndpoints(Microsoft.AspNetCore.Routing.RouteValueDictionary values) { throw null; } + } +} +namespace Microsoft.AspNetCore.Routing +{ + internal sealed partial class DataSourceDependentCache where T : class + { + private readonly Microsoft.AspNetCore.Routing.EndpointDataSource _dataSource; + private System.IDisposable _disposable; + private bool _disposed; + private readonly System.Func, T> _initializeCore; + private bool _initialized; + private readonly System.Func _initializer; + private readonly System.Action _initializerWithState; + private object _lock; + private T _value; + public DataSourceDependentCache(Microsoft.AspNetCore.Routing.EndpointDataSource dataSource, System.Func, T> initialize) { } + public T Value { get { throw null; } } + public void Dispose() { } + public T EnsureInitialized() { throw null; } + private T Initialize() { throw null; } + } +} +namespace Microsoft.Extensions.DependencyInjection +{ + internal partial class ApiBehaviorOptionsSetup + { + private Microsoft.AspNetCore.Mvc.Infrastructure.ProblemDetailsFactory _problemDetailsFactory; + public ApiBehaviorOptionsSetup() { } + public void Configure(Microsoft.AspNetCore.Mvc.ApiBehaviorOptions options) { } + internal static void ConfigureClientErrorMapping(Microsoft.AspNetCore.Mvc.ApiBehaviorOptions options) { } + internal static Microsoft.AspNetCore.Mvc.IActionResult ProblemDetailsInvalidModelStateResponse(Microsoft.AspNetCore.Mvc.Infrastructure.ProblemDetailsFactory problemDetailsFactory, Microsoft.AspNetCore.Mvc.ActionContext context) { throw null; } + } + internal partial class MvcCoreRouteOptionsSetup + { + public MvcCoreRouteOptionsSetup() { } + public void Configure(Microsoft.AspNetCore.Routing.RouteOptions options) { } + } + internal partial class MvcCoreBuilder : Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder + { + private readonly Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager _PartManager_k__BackingField; + private readonly Microsoft.Extensions.DependencyInjection.IServiceCollection _Services_k__BackingField; + public MvcCoreBuilder(Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager manager) { } + public Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager PartManager { get { throw null; } } + public Microsoft.Extensions.DependencyInjection.IServiceCollection Services { get { throw null; } } + } + internal partial class MvcBuilder : Microsoft.Extensions.DependencyInjection.IMvcBuilder + { + private readonly Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager _PartManager_k__BackingField; + private readonly Microsoft.Extensions.DependencyInjection.IServiceCollection _Services_k__BackingField; + public MvcBuilder(Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager manager) { } + public Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager PartManager { get { throw null; } } + public Microsoft.Extensions.DependencyInjection.IServiceCollection Services { get { throw null; } } + } +} +namespace Microsoft.Extensions.Internal +{ + internal partial class CopyOnWriteDictionary : System.Collections.Generic.IDictionary + { + private readonly System.Collections.Generic.IEqualityComparer _comparer; + private System.Collections.Generic.IDictionary _innerDictionary; + private readonly System.Collections.Generic.IDictionary _sourceDictionary; + public CopyOnWriteDictionary(System.Collections.Generic.IDictionary sourceDictionary, System.Collections.Generic.IEqualityComparer comparer) { } + public virtual int Count { get { throw null; } } + public virtual bool IsReadOnly { get { throw null; } } + public virtual TValue this[TKey key] { get { throw null; } set { } } + public virtual System.Collections.Generic.ICollection Keys { get { throw null; } } + private System.Collections.Generic.IDictionary ReadDictionary { get { throw null; } } + public virtual System.Collections.Generic.ICollection Values { get { throw null; } } + private System.Collections.Generic.IDictionary WriteDictionary { get { throw null; } } + public virtual void Add(System.Collections.Generic.KeyValuePair item) { } + public virtual void Add(TKey key, TValue value) { } + public virtual void Clear() { } + public virtual bool Contains(System.Collections.Generic.KeyValuePair item) { throw null; } + public virtual bool ContainsKey(TKey key) { throw null; } + public virtual void CopyTo(System.Collections.Generic.KeyValuePair[] array, int arrayIndex) { } + public virtual System.Collections.Generic.IEnumerator> GetEnumerator() { throw null; } + public bool Remove(System.Collections.Generic.KeyValuePair item) { throw null; } + public virtual bool Remove(TKey key) { throw null; } + System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } + public virtual bool TryGetValue(TKey key, out TValue value) { throw null; } + } + internal readonly partial struct AwaitableInfo + { + private readonly object _dummy; + public AwaitableInfo(System.Type awaiterType, System.Reflection.PropertyInfo awaiterIsCompletedProperty, System.Reflection.MethodInfo awaiterGetResultMethod, System.Reflection.MethodInfo awaiterOnCompletedMethod, System.Reflection.MethodInfo awaiterUnsafeOnCompletedMethod, System.Type resultType, System.Reflection.MethodInfo getAwaiterMethod) { throw null; } + public System.Reflection.MethodInfo AwaiterGetResultMethod { get { throw null; } } + public System.Reflection.PropertyInfo AwaiterIsCompletedProperty { get { throw null; } } + public System.Reflection.MethodInfo AwaiterOnCompletedMethod { get { throw null; } } + public System.Type AwaiterType { get { throw null; } } + public System.Reflection.MethodInfo AwaiterUnsafeOnCompletedMethod { get { throw null; } } + public System.Reflection.MethodInfo GetAwaiterMethod { get { throw null; } } + public System.Type ResultType { get { throw null; } } + public static bool IsTypeAwaitable(System.Type type, out Microsoft.Extensions.Internal.AwaitableInfo awaitableInfo) { throw null; } + } + internal readonly partial struct CoercedAwaitableInfo + { + private readonly object _dummy; + public CoercedAwaitableInfo(Microsoft.Extensions.Internal.AwaitableInfo awaitableInfo) { throw null; } + public CoercedAwaitableInfo(System.Linq.Expressions.Expression coercerExpression, System.Type coercerResultType, Microsoft.Extensions.Internal.AwaitableInfo coercedAwaitableInfo) { throw null; } + public Microsoft.Extensions.Internal.AwaitableInfo AwaitableInfo { get { throw null; } } + public System.Linq.Expressions.Expression CoercerExpression { get { throw null; } } + public System.Type CoercerResultType { get { throw null; } } + public bool RequiresCoercion { get { throw null; } } + public static bool IsTypeAwaitable(System.Type type, out Microsoft.Extensions.Internal.CoercedAwaitableInfo info) { throw null; } + } + internal partial class ObjectMethodExecutor + { + private readonly Microsoft.Extensions.Internal.ObjectMethodExecutor.MethodExecutor _executor; + private readonly Microsoft.Extensions.Internal.ObjectMethodExecutor.MethodExecutorAsync _executorAsync; + private static readonly System.Reflection.ConstructorInfo _objectMethodExecutorAwaitableConstructor; + private readonly object[] _parameterDefaultValues; + private readonly System.Type _AsyncResultType_k__BackingField; + private readonly bool _IsMethodAsync_k__BackingField; + private readonly System.Reflection.MethodInfo _MethodInfo_k__BackingField; + private readonly System.Reflection.ParameterInfo[] _MethodParameters_k__BackingField; + private System.Type _MethodReturnType_k__BackingField; + private readonly System.Reflection.TypeInfo _TargetTypeInfo_k__BackingField; + private ObjectMethodExecutor(System.Reflection.MethodInfo methodInfo, System.Reflection.TypeInfo targetTypeInfo, object[] parameterDefaultValues) { } + public System.Type AsyncResultType { get { throw null; } } + public bool IsMethodAsync { get { throw null; } } + public System.Reflection.MethodInfo MethodInfo { get { throw null; } } + public System.Reflection.ParameterInfo[] MethodParameters { get { throw null; } } + public System.Type MethodReturnType { get { throw null; } internal set { } } + public System.Reflection.TypeInfo TargetTypeInfo { get { throw null; } } + public static Microsoft.Extensions.Internal.ObjectMethodExecutor Create(System.Reflection.MethodInfo methodInfo, System.Reflection.TypeInfo targetTypeInfo) { throw null; } + public static Microsoft.Extensions.Internal.ObjectMethodExecutor Create(System.Reflection.MethodInfo methodInfo, System.Reflection.TypeInfo targetTypeInfo, object[] parameterDefaultValues) { throw null; } + public object Execute(object target, object[] parameters) { throw null; } + public Microsoft.Extensions.Internal.ObjectMethodExecutorAwaitable ExecuteAsync(object target, object[] parameters) { throw null; } + public object GetDefaultValueForParameter(int index) { throw null; } + private static Microsoft.Extensions.Internal.ObjectMethodExecutor.MethodExecutor GetExecutor(System.Reflection.MethodInfo methodInfo, System.Reflection.TypeInfo targetTypeInfo) { throw null; } + private static Microsoft.Extensions.Internal.ObjectMethodExecutor.MethodExecutorAsync GetExecutorAsync(System.Reflection.MethodInfo methodInfo, System.Reflection.TypeInfo targetTypeInfo, Microsoft.Extensions.Internal.CoercedAwaitableInfo coercedAwaitableInfo) { throw null; } + private static Microsoft.Extensions.Internal.ObjectMethodExecutor.MethodExecutor WrapVoidMethod(Microsoft.Extensions.Internal.ObjectMethodExecutor.VoidMethodExecutor executor) { throw null; } + private delegate object MethodExecutor(object target, object[] parameters); + private delegate Microsoft.Extensions.Internal.ObjectMethodExecutorAwaitable MethodExecutorAsync(object target, object[] parameters); + private delegate void VoidMethodExecutor(object target, object[] parameters); + } + internal readonly partial struct ObjectMethodExecutorAwaitable + { + private readonly object _dummy; + public ObjectMethodExecutorAwaitable(object customAwaitable, System.Func getAwaiterMethod, System.Func isCompletedMethod, System.Func getResultMethod, System.Action onCompletedMethod, System.Action unsafeOnCompletedMethod) { throw null; } + public Microsoft.Extensions.Internal.ObjectMethodExecutorAwaitable.Awaiter GetAwaiter() { throw null; } + public readonly partial struct Awaiter : System.Runtime.CompilerServices.ICriticalNotifyCompletion + { + private readonly object _dummy; + public Awaiter(object customAwaiter, System.Func isCompletedMethod, System.Func getResultMethod, System.Action onCompletedMethod, System.Action unsafeOnCompletedMethod) { throw null; } + public bool IsCompleted { get { throw null; } } + public object GetResult() { throw null; } + public void OnCompleted(System.Action continuation) { } + public void UnsafeOnCompleted(System.Action continuation) { } + } + } + internal partial class PropertyActivator + { + private readonly System.Action _fastPropertySetter; + private readonly System.Func _valueAccessor; + private System.Reflection.PropertyInfo _PropertyInfo_k__BackingField; + public PropertyActivator(System.Reflection.PropertyInfo propertyInfo, System.Func valueAccessor) { } + public System.Reflection.PropertyInfo PropertyInfo { get { throw null; } private set { } } + public object Activate(object instance, TContext context) { throw null; } + public static Microsoft.Extensions.Internal.PropertyActivator[] GetPropertiesToActivate(System.Type type, System.Type activateAttributeType, System.Func> createActivateInfo) { throw null; } + public static Microsoft.Extensions.Internal.PropertyActivator[] GetPropertiesToActivate(System.Type type, System.Type activateAttributeType, System.Func> createActivateInfo, bool includeNonPublic) { throw null; } + } + internal partial class PropertyHelper + { + private static readonly System.Reflection.MethodInfo CallNullSafePropertyGetterByReferenceOpenGenericMethod; + private static readonly System.Reflection.MethodInfo CallNullSafePropertyGetterOpenGenericMethod; + private static readonly System.Reflection.MethodInfo CallPropertyGetterByReferenceOpenGenericMethod; + private static readonly System.Reflection.MethodInfo CallPropertyGetterOpenGenericMethod; + private static readonly System.Reflection.MethodInfo CallPropertySetterOpenGenericMethod; + private static readonly System.Type IsByRefLikeAttribute; + private static readonly System.Collections.Concurrent.ConcurrentDictionary PropertiesCache; + private static readonly System.Collections.Concurrent.ConcurrentDictionary VisiblePropertiesCache; + private System.Func _valueGetter; + private System.Action _valueSetter; + private string _Name_k__BackingField; + private readonly System.Reflection.PropertyInfo _Property_k__BackingField; + public PropertyHelper(System.Reflection.PropertyInfo property) { } + public virtual string Name { get { throw null; } protected set { } } + public System.Reflection.PropertyInfo Property { get { throw null; } } + public System.Func ValueGetter { get { throw null; } } + public System.Action ValueSetter { get { throw null; } } + private static object CallNullSafePropertyGetterByReference(Microsoft.Extensions.Internal.PropertyHelper.ByRefFunc getter, object target) { throw null; } + private static object CallNullSafePropertyGetter(System.Func getter, object target) { throw null; } + private static object CallPropertyGetterByReference(Microsoft.Extensions.Internal.PropertyHelper.ByRefFunc getter, object target) { throw null; } + private static object CallPropertyGetter(System.Func getter, object target) { throw null; } + private static void CallPropertySetter(System.Action setter, object target, object value) { } + private static Microsoft.Extensions.Internal.PropertyHelper CreateInstance(System.Reflection.PropertyInfo property) { throw null; } + public static Microsoft.Extensions.Internal.PropertyHelper[] GetProperties(System.Reflection.TypeInfo typeInfo) { throw null; } + public static Microsoft.Extensions.Internal.PropertyHelper[] GetProperties(System.Type type) { throw null; } + protected static Microsoft.Extensions.Internal.PropertyHelper[] GetProperties(System.Type type, System.Func createPropertyHelper, System.Collections.Concurrent.ConcurrentDictionary cache) { throw null; } + public object GetValue(object instance) { throw null; } + public static Microsoft.Extensions.Internal.PropertyHelper[] GetVisibleProperties(System.Reflection.TypeInfo typeInfo) { throw null; } + public static Microsoft.Extensions.Internal.PropertyHelper[] GetVisibleProperties(System.Type type) { throw null; } + protected static Microsoft.Extensions.Internal.PropertyHelper[] GetVisibleProperties(System.Type type, System.Func createPropertyHelper, System.Collections.Concurrent.ConcurrentDictionary allPropertiesCache, System.Collections.Concurrent.ConcurrentDictionary visiblePropertiesCache) { throw null; } + private static bool IsInterestingProperty(System.Reflection.PropertyInfo property) { throw null; } + private static bool IsRefStructProperty(System.Reflection.PropertyInfo property) { throw null; } + public static System.Func MakeFastPropertyGetter(System.Reflection.PropertyInfo propertyInfo) { throw null; } + private static System.Func MakeFastPropertyGetter(System.Reflection.PropertyInfo propertyInfo, System.Reflection.MethodInfo propertyGetterWrapperMethod, System.Reflection.MethodInfo propertyGetterByRefWrapperMethod) { throw null; } + private static System.Func MakeFastPropertyGetter(System.Type openGenericDelegateType, System.Reflection.MethodInfo propertyGetMethod, System.Reflection.MethodInfo openGenericWrapperMethod) { throw null; } + public static System.Action MakeFastPropertySetter(System.Reflection.PropertyInfo propertyInfo) { throw null; } + public static System.Func MakeNullSafeFastPropertyGetter(System.Reflection.PropertyInfo propertyInfo) { throw null; } + public static System.Collections.Generic.IDictionary ObjectToDictionary(object value) { throw null; } + public void SetValue(object instance, object value) { } + private delegate TValue ByRefFunc(ref TDeclaringType arg); + } +} +namespace System.Text.Json +{ + internal static partial class JsonSerializerOptionsCopyConstructor + { + public static System.Text.Json.JsonSerializerOptions Copy(this System.Text.Json.JsonSerializerOptions serializerOptions, System.Text.Encodings.Web.JavaScriptEncoder encoder) { throw null; } + } +} \ No newline at end of file diff --git a/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.csproj b/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.csproj index e6b5b968a8b4..c14660a23715 100644 --- a/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.csproj +++ b/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.csproj @@ -18,6 +18,7 @@ + diff --git a/src/Mvc/Mvc.Core/src/Formatters/MediaTypeHeaderValues.cs b/src/Mvc/Mvc.Core/src/Formatters/MediaTypeHeaderValues.cs index 8d1eaae71708..1548e7eca475 100644 --- a/src/Mvc/Mvc.Core/src/Formatters/MediaTypeHeaderValues.cs +++ b/src/Mvc/Mvc.Core/src/Formatters/MediaTypeHeaderValues.cs @@ -16,6 +16,9 @@ public static readonly MediaTypeHeaderValue TextJson public static readonly MediaTypeHeaderValue ApplicationAnyJsonSyntax = MediaTypeHeaderValue.Parse("application/*+json").CopyAsReadOnly(); + public static readonly MediaTypeHeaderValue ApplicationJsonPatch + = MediaTypeHeaderValue.Parse("application/json-patch+json").CopyAsReadOnly(); + public static readonly MediaTypeHeaderValue ApplicationXml = MediaTypeHeaderValue.Parse("application/xml").CopyAsReadOnly(); diff --git a/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj b/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj index 203e5cdddfd4..983aed9ca168 100644 --- a/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj +++ b/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj @@ -20,6 +20,7 @@ Microsoft.AspNetCore.Mvc.RouteAttribute + @@ -48,6 +49,7 @@ Microsoft.AspNetCore.Mvc.RouteAttribute + diff --git a/src/Mvc/Mvc.Core/test/Microsoft.AspNetCore.Mvc.Core.Test.csproj b/src/Mvc/Mvc.Core/test/Microsoft.AspNetCore.Mvc.Core.Test.csproj index 1552b9c6e49d..09cf199474c5 100644 --- a/src/Mvc/Mvc.Core/test/Microsoft.AspNetCore.Mvc.Core.Test.csproj +++ b/src/Mvc/Mvc.Core/test/Microsoft.AspNetCore.Mvc.Core.Test.csproj @@ -10,6 +10,7 @@ + diff --git a/src/Mvc/Mvc.Cors/ref/Directory.Build.props b/src/Mvc/Mvc.Cors/ref/Directory.Build.props new file mode 100644 index 000000000000..ea5de23302dc --- /dev/null +++ b/src/Mvc/Mvc.Cors/ref/Directory.Build.props @@ -0,0 +1,7 @@ + + + + + $(NoWarn);CS0169 + + \ No newline at end of file diff --git a/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.Manual.cs b/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.Manual.cs new file mode 100644 index 000000000000..e76fd634d7a7 --- /dev/null +++ b/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.Manual.cs @@ -0,0 +1,23 @@ +// 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.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Core.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Cors.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] + +namespace Microsoft.AspNetCore.Mvc.Cors +{ + internal partial class CorsApplicationModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelProvider + { + private readonly Microsoft.AspNetCore.Mvc.MvcOptions _mvcOptions; + public CorsApplicationModelProvider(Microsoft.Extensions.Options.IOptions mvcOptions) { } + public int Order { get { throw null; } } + private static void ConfigureCorsActionConstraint(Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel actionModel) { } + private static void ConfigureCorsEndpointMetadata(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModel applicationModel) { } + private static void ConfigureCorsFilters(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + } +} \ No newline at end of file diff --git a/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.csproj b/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.csproj index a3bf5f99a621..ad611123a34c 100644 --- a/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.csproj +++ b/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.csproj @@ -5,6 +5,7 @@ + diff --git a/src/Mvc/Mvc.DataAnnotations/ref/Directory.Build.props b/src/Mvc/Mvc.DataAnnotations/ref/Directory.Build.props new file mode 100644 index 000000000000..b500fb5d98e7 --- /dev/null +++ b/src/Mvc/Mvc.DataAnnotations/ref/Directory.Build.props @@ -0,0 +1,8 @@ + + + + + true + $(NoWarn);CS0169 + + \ No newline at end of file diff --git a/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.Manual.cs b/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.Manual.cs new file mode 100644 index 000000000000..e36f2600fc93 --- /dev/null +++ b/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.Manual.cs @@ -0,0 +1,103 @@ +// 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.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.ViewFeatures, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.DataAnnotations.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Core.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Core.TestCommon, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.IntegrationTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.ViewFeatures.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Performance, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] + +namespace Microsoft.AspNetCore.Mvc.DataAnnotations +{ + internal partial class DataAnnotationsMetadataProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IBindingMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IDisplayMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IMetadataDetailsProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IValidationMetadataProvider + { + private const string NullableAttributeFullTypeName = "System.Runtime.CompilerServices.NullableAttribute"; + private const string NullableContextAttributeFullName = "System.Runtime.CompilerServices.NullableContextAttribute"; + private const string NullableContextFlagsFieldName = "Flag"; + private const string NullableFlagsFieldName = "NullableFlags"; + private readonly Microsoft.AspNetCore.Mvc.DataAnnotations.MvcDataAnnotationsLocalizationOptions _localizationOptions; + private readonly Microsoft.AspNetCore.Mvc.MvcOptions _options; + private readonly Microsoft.Extensions.Localization.IStringLocalizerFactory _stringLocalizerFactory; + public DataAnnotationsMetadataProvider(Microsoft.AspNetCore.Mvc.MvcOptions options, Microsoft.Extensions.Options.IOptions localizationOptions, Microsoft.Extensions.Localization.IStringLocalizerFactory stringLocalizerFactory) { } + public void CreateBindingMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.BindingMetadataProviderContext context) { } + public void CreateDisplayMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DisplayMetadataProviderContext context) { } + public void CreateValidationMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ValidationMetadataProviderContext context) { } + private static string GetDisplayGroup(System.Reflection.FieldInfo field) { throw null; } + private static string GetDisplayName(System.Reflection.FieldInfo field, Microsoft.Extensions.Localization.IStringLocalizer stringLocalizer) { throw null; } + internal static bool HasNullableAttribute(System.Collections.Generic.IEnumerable attributes, out bool isNullable) { throw null; } + internal static bool IsNullableBasedOnContext(System.Type containingType, System.Reflection.MemberInfo member) { throw null; } + internal static bool IsNullableReferenceType(System.Type containingType, System.Reflection.MemberInfo member, System.Collections.Generic.IEnumerable attributes) { throw null; } + } + internal partial class DefaultClientModelValidatorProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IClientModelValidatorProvider + { + public DefaultClientModelValidatorProvider() { } + public void CreateValidators(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientValidatorProviderContext context) { } + } + internal partial class DataAnnotationsClientModelValidatorProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IClientModelValidatorProvider + { + private readonly Microsoft.Extensions.Options.IOptions _options; + private readonly Microsoft.Extensions.Localization.IStringLocalizerFactory _stringLocalizerFactory; + private readonly Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider _validationAttributeAdapterProvider; + public DataAnnotationsClientModelValidatorProvider(Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider validationAttributeAdapterProvider, Microsoft.Extensions.Options.IOptions options, Microsoft.Extensions.Localization.IStringLocalizerFactory stringLocalizerFactory) { } + public void CreateValidators(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientValidatorProviderContext context) { } + } + internal partial class NumericClientModelValidatorProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IClientModelValidatorProvider + { + public NumericClientModelValidatorProvider() { } + public void CreateValidators(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientValidatorProviderContext context) { } + } + internal sealed partial class DataAnnotationsModelValidatorProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IMetadataBasedModelValidatorProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidatorProvider + { + private readonly Microsoft.Extensions.Options.IOptions _options; + private readonly Microsoft.Extensions.Localization.IStringLocalizerFactory _stringLocalizerFactory; + private readonly Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider _validationAttributeAdapterProvider; + public DataAnnotationsModelValidatorProvider(Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider validationAttributeAdapterProvider, Microsoft.Extensions.Options.IOptions options, Microsoft.Extensions.Localization.IStringLocalizerFactory stringLocalizerFactory) { } + public void CreateValidators(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidatorProviderContext context) { } + public bool HasValidators(System.Type modelType, System.Collections.Generic.IList validatorMetadata) { throw null; } + } + internal partial class StringLengthAttributeAdapter : Microsoft.AspNetCore.Mvc.DataAnnotations.AttributeAdapterBase + { + private readonly string _max; + private readonly string _min; + public StringLengthAttributeAdapter(System.ComponentModel.DataAnnotations.StringLengthAttribute attribute, Microsoft.Extensions.Localization.IStringLocalizer stringLocalizer) : base (default(System.ComponentModel.DataAnnotations.StringLengthAttribute), default(Microsoft.Extensions.Localization.IStringLocalizer)) { } + public override void AddValidation(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientModelValidationContext context) { } + public override string GetErrorMessage(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationContextBase validationContext) { throw null; } + } + internal partial class DataAnnotationsModelValidator : Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidator + { + private static readonly object _emptyValidationContextInstance; + private readonly Microsoft.Extensions.Localization.IStringLocalizer _stringLocalizer; + private readonly Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider _validationAttributeAdapterProvider; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly System.ComponentModel.DataAnnotations.ValidationAttribute _Attribute_k__BackingField; + public DataAnnotationsModelValidator(Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider validationAttributeAdapterProvider, System.ComponentModel.DataAnnotations.ValidationAttribute attribute, Microsoft.Extensions.Localization.IStringLocalizer stringLocalizer) { } + public System.ComponentModel.DataAnnotations.ValidationAttribute Attribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + private string GetErrorMessage(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationContextBase validationContext) { throw null; } + public System.Collections.Generic.IEnumerable Validate(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationContext validationContext) { throw null; } + } + internal partial class ValidatableObjectAdapter : Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidator + { + public ValidatableObjectAdapter() { } + public System.Collections.Generic.IEnumerable Validate(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationContext context) { throw null; } + } +} +namespace Microsoft.Extensions.DependencyInjection +{ + internal partial class MvcDataAnnotationsMvcOptionsSetup : Microsoft.Extensions.Options.IConfigureOptions + { + private readonly Microsoft.Extensions.Options.IOptions _dataAnnotationLocalizationOptions; + private readonly Microsoft.Extensions.Localization.IStringLocalizerFactory _stringLocalizerFactory; + private readonly Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider _validationAttributeAdapterProvider; + public MvcDataAnnotationsMvcOptionsSetup(Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider validationAttributeAdapterProvider, Microsoft.Extensions.Options.IOptions dataAnnotationLocalizationOptions) { } + public MvcDataAnnotationsMvcOptionsSetup(Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider validationAttributeAdapterProvider, Microsoft.Extensions.Options.IOptions dataAnnotationLocalizationOptions, Microsoft.Extensions.Localization.IStringLocalizerFactory stringLocalizerFactory) { } + public void Configure(Microsoft.AspNetCore.Mvc.MvcOptions options) { } + } +} \ No newline at end of file diff --git a/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj b/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj index 31f61788d13c..1d4f09f1b2c9 100644 --- a/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj +++ b/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj @@ -5,6 +5,7 @@ + diff --git a/src/Mvc/Mvc.DataAnnotations/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj b/src/Mvc/Mvc.DataAnnotations/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj index c205a676cd24..34294c7daa57 100644 --- a/src/Mvc/Mvc.DataAnnotations/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj +++ b/src/Mvc/Mvc.DataAnnotations/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj @@ -7,6 +7,7 @@ + diff --git a/src/Mvc/Mvc.Formatters.Xml/src/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj b/src/Mvc/Mvc.Formatters.Xml/src/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj index 72e0ef3fdcce..6c9b248d019d 100644 --- a/src/Mvc/Mvc.Formatters.Xml/src/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj +++ b/src/Mvc/Mvc.Formatters.Xml/src/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj @@ -11,6 +11,8 @@ + + diff --git a/src/Mvc/Mvc.Formatters.Xml/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj b/src/Mvc/Mvc.Formatters.Xml/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj index b51ba4d2dffc..a6025358094e 100644 --- a/src/Mvc/Mvc.Formatters.Xml/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj +++ b/src/Mvc/Mvc.Formatters.Xml/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj @@ -7,6 +7,7 @@ + diff --git a/src/Mvc/Mvc.NewtonsoftJson/src/MediaTypeHeaderValues.cs b/src/Mvc/Mvc.NewtonsoftJson/src/MediaTypeHeaderValues.cs deleted file mode 100644 index 5795d08d3509..000000000000 --- a/src/Mvc/Mvc.NewtonsoftJson/src/MediaTypeHeaderValues.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 Microsoft.Net.Http.Headers; - -namespace Microsoft.AspNetCore.Mvc.NewtonsoftJson -{ - internal static class MediaTypeHeaderValues - { - public static readonly MediaTypeHeaderValue ApplicationJson - = MediaTypeHeaderValue.Parse("application/json").CopyAsReadOnly(); - - public static readonly MediaTypeHeaderValue TextJson - = MediaTypeHeaderValue.Parse("text/json").CopyAsReadOnly(); - - public static readonly MediaTypeHeaderValue ApplicationJsonPatch - = MediaTypeHeaderValue.Parse("application/json-patch+json").CopyAsReadOnly(); - - public static readonly MediaTypeHeaderValue ApplicationAnyJsonSyntax - = MediaTypeHeaderValue.Parse("application/*+json").CopyAsReadOnly(); - } -} diff --git a/src/Mvc/Mvc.NewtonsoftJson/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj b/src/Mvc/Mvc.NewtonsoftJson/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj index 2c81323847d0..53a5985ed13d 100644 --- a/src/Mvc/Mvc.NewtonsoftJson/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj +++ b/src/Mvc/Mvc.NewtonsoftJson/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj @@ -21,7 +21,6 @@ - diff --git a/src/Mvc/Mvc.NewtonsoftJson/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test.csproj b/src/Mvc/Mvc.NewtonsoftJson/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test.csproj index 0cf127eac92f..ddac8c696127 100644 --- a/src/Mvc/Mvc.NewtonsoftJson/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test.csproj +++ b/src/Mvc/Mvc.NewtonsoftJson/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test.csproj @@ -6,6 +6,7 @@ + diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj index 734825c240c3..49674d70ce2e 100644 --- a/src/Mvc/Mvc.Razor.RuntimeCompilation/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj +++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj @@ -6,6 +6,7 @@ + diff --git a/src/Mvc/Mvc.Razor/ref/Directory.Build.props b/src/Mvc/Mvc.Razor/ref/Directory.Build.props new file mode 100644 index 000000000000..ea5de23302dc --- /dev/null +++ b/src/Mvc/Mvc.Razor/ref/Directory.Build.props @@ -0,0 +1,7 @@ + + + + + $(NoWarn);CS0169 + + \ No newline at end of file diff --git a/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.Manual.cs b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.Manual.cs new file mode 100644 index 000000000000..99b132f94339 --- /dev/null +++ b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.Manual.cs @@ -0,0 +1,245 @@ +// 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.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.RazorPages, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.TagHelpers, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.RazorPages.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.TagHelpers.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] + +[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] + +namespace Microsoft.AspNetCore.Mvc.ApplicationParts +{ + internal partial class RazorCompiledItemFeatureProvider + { + public RazorCompiledItemFeatureProvider() { } + public void PopulateFeature(System.Collections.Generic.IEnumerable parts, Microsoft.AspNetCore.Mvc.Razor.Compilation.ViewsFeature feature) { } + } +} +namespace Microsoft.AspNetCore.Mvc.Razor +{ + public partial class RazorPageActivator : Microsoft.AspNetCore.Mvc.Razor.IRazorPageActivator + { + internal Microsoft.AspNetCore.Mvc.Razor.RazorPagePropertyActivator GetOrAddCacheEntry(Microsoft.AspNetCore.Mvc.Razor.IRazorPage page) { throw null; } + } + internal partial class DefaultTagHelperFactory : Microsoft.AspNetCore.Mvc.Razor.ITagHelperFactory + { + private readonly Microsoft.AspNetCore.Mvc.Razor.ITagHelperActivator _activator; + private static readonly System.Func> _createActivateInfo; + private readonly System.Func[]> _getPropertiesToActivate; + private readonly System.Collections.Concurrent.ConcurrentDictionary[]> _injectActions; + public DefaultTagHelperFactory(Microsoft.AspNetCore.Mvc.Razor.ITagHelperActivator activator) { } + private static Microsoft.Extensions.Internal.PropertyActivator CreateActivateInfo(System.Reflection.PropertyInfo property) { throw null; } + public TTagHelper CreateTagHelper(Microsoft.AspNetCore.Mvc.Rendering.ViewContext context) where TTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper { throw null; } + private static void InitializeTagHelper(TTagHelper tagHelper, Microsoft.AspNetCore.Mvc.Rendering.ViewContext context) where TTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper { } + } + public partial class RazorView + { + internal System.Action OnAfterPageActivated { get { throw null; } set { } } + } + internal partial class RazorPagePropertyActivator + { + private readonly Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider _metadataProvider; + private readonly System.Func _nestedFactory; + private readonly Microsoft.Extensions.Internal.PropertyActivator[] _propertyActivators; + private readonly System.Func _rootFactory; + private readonly System.Type _viewDataDictionaryType; + public RazorPagePropertyActivator(System.Type pageType, System.Type declaredModelType, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.Razor.RazorPagePropertyActivator.PropertyValueAccessors propertyValueAccessors) { } + public void Activate(object page, Microsoft.AspNetCore.Mvc.Rendering.ViewContext context) { } + private static Microsoft.Extensions.Internal.PropertyActivator CreateActivateInfo(System.Reflection.PropertyInfo property, Microsoft.AspNetCore.Mvc.Razor.RazorPagePropertyActivator.PropertyValueAccessors valueAccessors) { throw null; } + internal Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary CreateViewDataDictionary(Microsoft.AspNetCore.Mvc.Rendering.ViewContext context) { throw null; } + public partial class PropertyValueAccessors + { + private System.Func _DiagnosticSourceAccessor_k__BackingField; + private System.Func _HtmlEncoderAccessor_k__BackingField; + private System.Func _JsonHelperAccessor_k__BackingField; + private System.Func _ModelExpressionProviderAccessor_k__BackingField; + private System.Func _UrlHelperAccessor_k__BackingField; + public PropertyValueAccessors() { } + public System.Func DiagnosticSourceAccessor { get { throw null; } set { } } + public System.Func HtmlEncoderAccessor { get { throw null; } set { } } + public System.Func JsonHelperAccessor { get { throw null; } set { } } + public System.Func ModelExpressionProviderAccessor { get { throw null; } set { } } + public System.Func UrlHelperAccessor { get { throw null; } set { } } + } + } + internal partial interface IModelTypeProvider + { + System.Type GetModelType(); + } + internal static partial class RazorFileHierarchy + { + private const string ViewStartFileName = "_ViewStart.cshtml"; + public static System.Collections.Generic.IEnumerable GetViewStartPaths(string path) { throw null; } + } + internal partial class RazorViewEngineOptionsSetup + { + public RazorViewEngineOptionsSetup() { } + public void Configure(Microsoft.AspNetCore.Mvc.Razor.RazorViewEngineOptions options) { } + } + internal partial class DefaultViewCompiler : Microsoft.AspNetCore.Mvc.Razor.Compilation.IViewCompiler + { + private readonly System.Collections.Generic.Dictionary> _compiledViews; + private readonly Microsoft.Extensions.Logging.ILogger _logger; + private readonly System.Collections.Concurrent.ConcurrentDictionary _normalizedPathCache; + public DefaultViewCompiler(System.Collections.Generic.IList compiledViews, Microsoft.Extensions.Logging.ILogger logger) { } + public System.Threading.Tasks.Task CompileAsync(string relativePath) { throw null; } + private string GetNormalizedPath(string relativePath) { throw null; } + } + internal static partial class ViewPath + { + public static string NormalizePath(string path) { throw null; } + } + internal partial class ServiceBasedTagHelperActivator : Microsoft.AspNetCore.Mvc.Razor.ITagHelperActivator + { + public ServiceBasedTagHelperActivator() { } + public TTagHelper Create(Microsoft.AspNetCore.Mvc.Rendering.ViewContext context) where TTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper { throw null; } + } + internal partial class TagHelperComponentManager : Microsoft.AspNetCore.Mvc.Razor.TagHelpers.ITagHelperComponentManager + { + private readonly System.Collections.Generic.ICollection _Components_k__BackingField; + public TagHelperComponentManager(System.Collections.Generic.IEnumerable tagHelperComponents) { } + public System.Collections.Generic.ICollection Components { get { throw null; } } + } + internal static partial class Resources + { + private static System.Resources.ResourceManager s_resourceManager; + private static System.Globalization.CultureInfo _Culture_k__BackingField; + internal static string ArgumentCannotBeNullOrEmpty { get { throw null; } } + internal static string CompilationFailed { get { throw null; } } + internal static string Compilation_MissingReferences { get { throw null; } } + internal static string CompiledViewDescriptor_NoData { get { throw null; } } + internal static string CouldNotResolveApplicationRelativeUrl_TagHelper { get { throw null; } } + internal static System.Globalization.CultureInfo Culture { get { throw null; } set { } } + internal static string FileProvidersAreRequired { get { throw null; } } + internal static string FlushPointCannotBeInvoked { get { throw null; } } + internal static string GeneratedCodeFileName { get { throw null; } } + internal static string LayoutCannotBeLocated { get { throw null; } } + internal static string LayoutCannotBeRendered { get { throw null; } } + internal static string LayoutHasCircularReference { get { throw null; } } + internal static string PropertyMustBeSet { get { throw null; } } + internal static string RazorPage_CannotFlushWhileInAWritingScope { get { throw null; } } + internal static string RazorPage_InvalidTagHelperIndexerAssignment { get { throw null; } } + internal static string RazorPage_MethodCannotBeCalled { get { throw null; } } + internal static string RazorPage_NestingAttributeWritingScopesNotSupported { get { throw null; } } + internal static string RazorPage_ThereIsNoActiveWritingScopeToEnd { get { throw null; } } + internal static string RazorProject_PathMustStartWithForwardSlash { get { throw null; } } + internal static string RazorViewCompiler_ViewPathsDifferOnlyInCase { get { throw null; } } + internal static string RenderBodyNotCalled { get { throw null; } } + internal static System.Resources.ResourceManager ResourceManager { get { throw null; } } + internal static string SectionAlreadyDefined { get { throw null; } } + internal static string SectionAlreadyRendered { get { throw null; } } + internal static string SectionNotDefined { get { throw null; } } + internal static string SectionsNotRendered { get { throw null; } } + internal static string UnsupportedDebugInformationFormat { get { throw null; } } + internal static string ViewContextMustBeSet { get { throw null; } } + internal static string ViewLocationFormatsIsRequired { get { throw null; } } + internal static string FormatCompilation_MissingReferences(object p0) { throw null; } + internal static string FormatCompiledViewDescriptor_NoData(object p0, object p1) { throw null; } + internal static string FormatCouldNotResolveApplicationRelativeUrl_TagHelper(object p0, object p1, object p2, object p3, object p4, object p5) { throw null; } + internal static string FormatFileProvidersAreRequired(object p0, object p1, object p2) { throw null; } + internal static string FormatFlushPointCannotBeInvoked(object p0) { throw null; } + internal static string FormatLayoutCannotBeLocated(object p0, object p1) { throw null; } + internal static string FormatLayoutCannotBeRendered(object p0, object p1) { throw null; } + internal static string FormatLayoutHasCircularReference(object p0, object p1) { throw null; } + internal static string FormatPropertyMustBeSet(object p0, object p1) { throw null; } + internal static string FormatRazorPage_CannotFlushWhileInAWritingScope(object p0, object p1) { throw null; } + internal static string FormatRazorPage_InvalidTagHelperIndexerAssignment(object p0, object p1, object p2) { throw null; } + internal static string FormatRazorPage_MethodCannotBeCalled(object p0, object p1) { throw null; } + internal static string FormatRenderBodyNotCalled(object p0, object p1, object p2) { throw null; } + internal static string FormatSectionAlreadyDefined(object p0) { throw null; } + internal static string FormatSectionAlreadyRendered(object p0, object p1, object p2) { throw null; } + internal static string FormatSectionNotDefined(object p0, object p1, object p2) { throw null; } + internal static string FormatSectionsNotRendered(object p0, object p1, object p2) { throw null; } + internal static string FormatUnsupportedDebugInformationFormat(object p0) { throw null; } + internal static string FormatViewContextMustBeSet(object p0, object p1) { throw null; } + internal static string FormatViewLocationFormatsIsRequired(object p0) { throw null; } + internal static string GetResourceString(string resourceKey, string defaultValue = null) { throw null; } + private static string GetResourceString(string resourceKey, string[] formatterNames) { throw null; } + } + internal partial class DefaultRazorPageFactoryProvider : Microsoft.AspNetCore.Mvc.Razor.IRazorPageFactoryProvider + { + private readonly Microsoft.AspNetCore.Mvc.Razor.Compilation.IViewCompilerProvider _viewCompilerProvider; + public DefaultRazorPageFactoryProvider(Microsoft.AspNetCore.Mvc.Razor.Compilation.IViewCompilerProvider viewCompilerProvider) { } + private Microsoft.AspNetCore.Mvc.Razor.Compilation.IViewCompiler Compiler { get { throw null; } } + public Microsoft.AspNetCore.Mvc.Razor.RazorPageFactoryResult CreateFactory(string relativePath) { throw null; } + } + public partial class RazorViewEngine : Microsoft.AspNetCore.Mvc.Razor.IRazorViewEngine + { + internal System.Collections.Generic.IEnumerable GetViewLocationFormats(Microsoft.AspNetCore.Mvc.Razor.ViewLocationExpanderContext context) { throw null; } + } +} +namespace Microsoft.AspNetCore.Mvc.Razor.Infrastructure +{ + internal partial class DefaultFileVersionProvider : Microsoft.AspNetCore.Mvc.ViewFeatures.IFileVersionProvider + { + private static readonly char[] QueryStringAndFragmentTokens; + private const string VersionKey = "v"; + private readonly Microsoft.Extensions.Caching.Memory.IMemoryCache _Cache_k__BackingField; + private readonly Microsoft.Extensions.FileProviders.IFileProvider _FileProvider_k__BackingField; + public DefaultFileVersionProvider(Microsoft.AspNetCore.Hosting.IWebHostEnvironment hostingEnvironment, Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider cacheProvider) { } + public Microsoft.Extensions.Caching.Memory.IMemoryCache Cache { get { throw null; } } + public Microsoft.Extensions.FileProviders.IFileProvider FileProvider { get { throw null; } } + public string AddFileVersionToPath(Microsoft.AspNetCore.Http.PathString requestPathBase, string path) { throw null; } + private static string GetHashForFile(Microsoft.Extensions.FileProviders.IFileInfo fileInfo) { throw null; } + } + internal partial class DefaultTagHelperActivator : Microsoft.AspNetCore.Mvc.Razor.ITagHelperActivator + { + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.ITypeActivatorCache _typeActivatorCache; + public DefaultTagHelperActivator(Microsoft.AspNetCore.Mvc.Infrastructure.ITypeActivatorCache typeActivatorCache) { } + public TTagHelper Create(Microsoft.AspNetCore.Mvc.Rendering.ViewContext context) where TTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper { throw null; } + } + public sealed partial class TagHelperMemoryCacheProvider + { + private Microsoft.Extensions.Caching.Memory.IMemoryCache _Cache_k__BackingField; + public TagHelperMemoryCacheProvider() { } + public Microsoft.Extensions.Caching.Memory.IMemoryCache Cache { get { throw null; } internal set { } } + } +} +namespace Microsoft.AspNetCore.Mvc.Razor.TagHelpers +{ + internal partial class TagHelperComponentPropertyActivator : Microsoft.AspNetCore.Mvc.Razor.TagHelpers.ITagHelperComponentPropertyActivator + { + private static readonly System.Func> _createActivateInfo; + private readonly System.Func[]> _getPropertiesToActivate; + private readonly System.Collections.Concurrent.ConcurrentDictionary[]> _propertiesToActivate; + public TagHelperComponentPropertyActivator() { } + public void Activate(Microsoft.AspNetCore.Mvc.Rendering.ViewContext context, Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent tagHelperComponent) { } + private static Microsoft.Extensions.Internal.PropertyActivator CreateActivateInfo(System.Reflection.PropertyInfo property) { throw null; } + private static Microsoft.Extensions.Internal.PropertyActivator[] GetPropertiesToActivate(System.Type type) { throw null; } + } +} +namespace Microsoft.AspNetCore.Mvc.Razor.Compilation +{ + internal partial class DefaultViewCompilerProvider : Microsoft.AspNetCore.Mvc.Razor.Compilation.IViewCompilerProvider + { + private readonly Microsoft.AspNetCore.Mvc.Razor.Compilation.DefaultViewCompiler _compiler; + public DefaultViewCompilerProvider(Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager applicationPartManager, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + public Microsoft.AspNetCore.Mvc.Razor.Compilation.IViewCompiler GetCompiler() { throw null; } + } + internal partial class DefaultViewCompiler : Microsoft.AspNetCore.Mvc.Razor.Compilation.IViewCompiler + { + private readonly System.Collections.Generic.Dictionary> _compiledViews; + private readonly Microsoft.Extensions.Logging.ILogger _logger; + private readonly System.Collections.Concurrent.ConcurrentDictionary _normalizedPathCache; + public DefaultViewCompiler(System.Collections.Generic.IList compiledViews, Microsoft.Extensions.Logging.ILogger logger) { } + public System.Threading.Tasks.Task CompileAsync(string relativePath) { throw null; } + private string GetNormalizedPath(string relativePath) { throw null; } + } +} +namespace Microsoft.Extensions.DependencyInjection +{ + internal partial class MvcRazorMvcViewOptionsSetup + { + private readonly Microsoft.AspNetCore.Mvc.Razor.IRazorViewEngine _razorViewEngine; + public MvcRazorMvcViewOptionsSetup(Microsoft.AspNetCore.Mvc.Razor.IRazorViewEngine razorViewEngine) { } + public void Configure(Microsoft.AspNetCore.Mvc.MvcViewOptions options) { } + } +} \ No newline at end of file diff --git a/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.csproj b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.csproj index eb432ae8ad7c..84a430d43b7f 100644 --- a/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.csproj +++ b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.csproj @@ -5,6 +5,7 @@ + diff --git a/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.netcoreapp3.0.cs b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.netcoreapp3.0.cs index d7bb661a5bb7..af11f8aa37e6 100644 --- a/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.netcoreapp3.0.cs +++ b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.netcoreapp3.0.cs @@ -290,14 +290,6 @@ public ViewsFeature() { } public System.Collections.Generic.IList ViewDescriptors { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } } } -namespace Microsoft.AspNetCore.Mvc.Razor.Infrastructure -{ - public sealed partial class TagHelperMemoryCacheProvider - { - public TagHelperMemoryCacheProvider() { } - public Microsoft.Extensions.Caching.Memory.IMemoryCache Cache { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } -} namespace Microsoft.AspNetCore.Mvc.Razor.Internal { [System.AttributeUsageAttribute(System.AttributeTargets.Property, AllowMultiple=false, Inherited=true)] diff --git a/src/Mvc/Mvc.Razor/src/Infrastructure/CryptographyAlgorithms.cs b/src/Mvc/Mvc.Razor/src/Infrastructure/CryptographyAlgorithms.cs deleted file mode 100644 index 24423154772a..000000000000 --- a/src/Mvc/Mvc.Razor/src/Infrastructure/CryptographyAlgorithms.cs +++ /dev/null @@ -1,25 +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.Security.Cryptography; - -namespace Microsoft.AspNetCore.Mvc.Razor.Infrastructure -{ - internal static class CryptographyAlgorithms - { - public static SHA256 CreateSHA256() - { - try - { - return SHA256.Create(); - } - // SHA256.Create is documented to throw this exception on FIPS compliant machines. - // See: https://msdn.microsoft.com/en-us/library/z08hz7ad%28v=vs.110%29.aspx?f=255&MSPPError=-2147217396 - catch (System.Reflection.TargetInvocationException) - { - // Fallback to a FIPS compliant SHA256 algorithm. - return new SHA256CryptoServiceProvider(); - } - } - } -} diff --git a/src/Mvc/Mvc.Razor/src/Infrastructure/DefaultFileVersionProvider.cs b/src/Mvc/Mvc.Razor/src/Infrastructure/DefaultFileVersionProvider.cs index a58bf6252db4..5bf37a320c16 100644 --- a/src/Mvc/Mvc.Razor/src/Infrastructure/DefaultFileVersionProvider.cs +++ b/src/Mvc/Mvc.Razor/src/Infrastructure/DefaultFileVersionProvider.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using Microsoft.AspNetCore.Antiforgery; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.ViewFeatures; diff --git a/src/Mvc/Mvc.Razor/src/Microsoft.AspNetCore.Mvc.Razor.csproj b/src/Mvc/Mvc.Razor/src/Microsoft.AspNetCore.Mvc.Razor.csproj index 0ef53a3026ed..8d1678ec2c82 100644 --- a/src/Mvc/Mvc.Razor/src/Microsoft.AspNetCore.Mvc.Razor.csproj +++ b/src/Mvc/Mvc.Razor/src/Microsoft.AspNetCore.Mvc.Razor.csproj @@ -11,6 +11,8 @@ + + diff --git a/src/Mvc/Mvc.Razor/test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj b/src/Mvc/Mvc.Razor/test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj index 0a8a4e0fc16d..aa9e607e3bdf 100644 --- a/src/Mvc/Mvc.Razor/test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj +++ b/src/Mvc/Mvc.Razor/test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj @@ -13,6 +13,9 @@ + + + diff --git a/src/Mvc/Mvc.RazorPages/ref/Directory.Build.props b/src/Mvc/Mvc.RazorPages/ref/Directory.Build.props index db0125b36c16..da31f31a30b5 100644 --- a/src/Mvc/Mvc.RazorPages/ref/Directory.Build.props +++ b/src/Mvc/Mvc.RazorPages/ref/Directory.Build.props @@ -2,6 +2,10 @@ + + $(NoWarn);CS0169 + + diff --git a/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.Manual.cs b/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.Manual.cs index 64141594e443..b701801f9f31 100644 --- a/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.Manual.cs +++ b/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.Manual.cs @@ -1,6 +1,31 @@ // 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.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.IntegrationTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.RazorPages.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] + +namespace Microsoft.AspNetCore.Builder +{ + internal partial class CompiledPageRouteModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IPageRouteModelProvider + { + private static readonly string RazorPageDocumentKind; + private static readonly string RouteTemplateKey; + private readonly Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager _applicationManager; + private readonly Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptions _pagesOptions; + private readonly Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModelFactory _routeModelFactory; + public CompiledPageRouteModelProvider(Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager applicationManager, Microsoft.Extensions.Options.IOptions pagesOptionsAccessor, Microsoft.Extensions.Logging.ILogger logger) { } + public int Order { get { throw null; } } + internal static string GetRouteTemplate(Microsoft.AspNetCore.Mvc.Razor.Compilation.CompiledViewDescriptor viewDescriptor) { throw null; } + protected virtual Microsoft.AspNetCore.Mvc.Razor.Compilation.ViewsFeature GetViewFeature(Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager applicationManager) { throw null; } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModelProviderContext context) { } + } +} namespace Microsoft.AspNetCore.Mvc.ApplicationModels { // https://github.com/dotnet/arcade/issues/2066 @@ -28,4 +53,294 @@ public partial class PagePropertyModel : Microsoft.AspNetCore.Mvc.ApplicationMod System.Collections.Generic.IReadOnlyList Microsoft.AspNetCore.Mvc.ApplicationModels.ICommonModel.Attributes { get { throw null; } } System.Collections.Generic.IDictionary Microsoft.AspNetCore.Mvc.ApplicationModels.IPropertyModel.Properties { get { throw null; } } } + internal partial class PageRouteModelFactory + { + private static readonly string IndexFileName; + private readonly Microsoft.Extensions.Logging.ILogger _logger; + private readonly string _normalizedAreaRootDirectory; + private readonly string _normalizedRootDirectory; + private readonly Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptions _options; + private static readonly System.Action _unsupportedAreaPath; + public PageRouteModelFactory(Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptions options, Microsoft.Extensions.Logging.ILogger logger) { } + private static string CreateAreaRoute(string areaName, string viewEnginePath) { throw null; } + public Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModel CreateAreaRouteModel(string relativePath, string routeTemplate) { throw null; } + public Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModel CreateRouteModel(string relativePath, string routeTemplate) { throw null; } + private static Microsoft.AspNetCore.Mvc.ApplicationModels.SelectorModel CreateSelectorModel(string prefix, string routeTemplate) { throw null; } + private string GetViewEnginePath(string rootDirectory, string path) { throw null; } + private static string NormalizeDirectory(string directory) { throw null; } + private static void PopulateRouteModel(Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModel model, string pageRoute, string routeTemplate) { } + internal bool TryParseAreaPath(string relativePath, out (string areaName, string viewEnginePath) result) { throw null; } + } + internal partial class AuthorizationPageApplicationModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelProvider + { + private readonly Microsoft.AspNetCore.Mvc.MvcOptions _mvcOptions; + private readonly Microsoft.AspNetCore.Authorization.IAuthorizationPolicyProvider _policyProvider; + public AuthorizationPageApplicationModelProvider(Microsoft.AspNetCore.Authorization.IAuthorizationPolicyProvider policyProvider, Microsoft.Extensions.Options.IOptions mvcOptions) { } + public int Order { get { throw null; } } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext context) { } + } + internal partial class DefaultPageApplicationModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelProvider + { + private const string ModelPropertyName = "Model"; + private readonly Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandleOptionsRequestsPageFilter _handleOptionsRequestsFilter; + private readonly Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider _modelMetadataProvider; + private readonly Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelPartsProvider _pageApplicationModelPartsProvider; + private readonly Microsoft.AspNetCore.Mvc.Filters.PageHandlerPageFilter _pageHandlerPageFilter; + private readonly Microsoft.AspNetCore.Mvc.Filters.PageHandlerResultFilter _pageHandlerResultFilter; + private readonly Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptions _razorPagesOptions; + public DefaultPageApplicationModelProvider(Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider, Microsoft.Extensions.Options.IOptions razorPagesOptions, Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelPartsProvider pageApplicationModelPartsProvider) { } + public int Order { get { throw null; } } + protected virtual Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel CreateModel(Microsoft.AspNetCore.Mvc.RazorPages.PageActionDescriptor actionDescriptor, System.Reflection.TypeInfo pageTypeInfo) { throw null; } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext context) { } + internal void PopulateFilters(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel pageModel) { } + internal void PopulateHandlerMethods(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel pageModel) { } + internal void PopulateHandlerProperties(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel pageModel) { } + } + internal partial class TempDataFilterPageApplicationModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelProvider + { + private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.Infrastructure.TempDataSerializer _tempDataSerializer; + public TempDataFilterPageApplicationModelProvider(Microsoft.AspNetCore.Mvc.ViewFeatures.Infrastructure.TempDataSerializer tempDataSerializer) { } + public int Order { get { throw null; } } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext context) { } + } + internal partial class ViewDataAttributePageApplicationModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelProvider + { + public ViewDataAttributePageApplicationModelProvider() { } + public int Order { get { throw null; } } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext context) { } + } + internal partial class ResponseCacheFilterApplicationModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelProvider + { + private readonly Microsoft.Extensions.Logging.ILoggerFactory _loggerFactory; + private readonly Microsoft.AspNetCore.Mvc.MvcOptions _mvcOptions; + public ResponseCacheFilterApplicationModelProvider(Microsoft.Extensions.Options.IOptions mvcOptionsAccessor, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + public int Order { get { throw null; } } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext context) { } + } + internal partial class CompiledPageRouteModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IPageRouteModelProvider + { + private static readonly string RazorPageDocumentKind; + private static readonly string RouteTemplateKey; + private readonly Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager _applicationManager; + private readonly Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptions _pagesOptions; + private readonly Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModelFactory _routeModelFactory; + public CompiledPageRouteModelProvider(Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager applicationManager, Microsoft.Extensions.Options.IOptions pagesOptionsAccessor, Microsoft.Extensions.Logging.ILogger logger) { } + public int Order { get { throw null; } } + private void CreateModels(Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModelProviderContext context) { } + private System.Collections.Generic.IEnumerable GetViewDescriptors(Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager applicationManager) { throw null; } + protected virtual Microsoft.AspNetCore.Mvc.Razor.Compilation.ViewsFeature GetViewFeature(Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager applicationManager) { throw null; } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModelProviderContext context) { } + } } +namespace Microsoft.AspNetCore.Mvc.Filters +{ + internal partial class PageHandlerPageFilter : Microsoft.AspNetCore.Mvc.Filters.IAsyncPageFilter, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter + { + public PageHandlerPageFilter() { } + public int Order { get { throw null; } } + public System.Threading.Tasks.Task OnPageHandlerExecutionAsync(Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutingContext context, Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutionDelegate next) { throw null; } + public System.Threading.Tasks.Task OnPageHandlerSelectionAsync(Microsoft.AspNetCore.Mvc.Filters.PageHandlerSelectedContext context) { throw null; } + } + internal partial class PageHandlerResultFilter : Microsoft.AspNetCore.Mvc.Filters.IAsyncResultFilter, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter + { + public PageHandlerResultFilter() { } + public int Order { get { throw null; } } + public System.Threading.Tasks.Task OnResultExecutionAsync(Microsoft.AspNetCore.Mvc.Filters.ResultExecutingContext context, Microsoft.AspNetCore.Mvc.Filters.ResultExecutionDelegate next) { throw null; } + } +} +namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure +{ + internal sealed partial class HandleOptionsRequestsPageFilter : Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter, Microsoft.AspNetCore.Mvc.Filters.IPageFilter + { + public HandleOptionsRequestsPageFilter() { } + public int Order { get { throw null; } } + public void OnPageHandlerExecuted(Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutedContext context) { } + public void OnPageHandlerExecuting(Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutingContext context) { } + public void OnPageHandlerSelected(Microsoft.AspNetCore.Mvc.Filters.PageHandlerSelectedContext context) { } + } + internal delegate System.Threading.Tasks.Task PageHandlerExecutorDelegate(object handler, object[] arguments); + internal partial class PageActionInvoker : Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker, Microsoft.AspNetCore.Mvc.Abstractions.IActionInvoker + { + private readonly Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor _actionDescriptor; + private System.Collections.Generic.Dictionary _arguments; + private Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor _handler; + private Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutedContext _handlerExecutedContext; + private Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutingContext _handlerExecutingContext; + private Microsoft.AspNetCore.Mvc.Filters.PageHandlerSelectedContext _handlerSelectedContext; + private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.HtmlHelperOptions _htmlHelperOptions; + private Microsoft.AspNetCore.Mvc.RazorPages.PageBase _page; + private readonly Microsoft.AspNetCore.Mvc.RazorPages.PageContext _pageContext; + private object _pageModel; + private readonly Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder _parameterBinder; + private readonly Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.IPageHandlerMethodSelector _selector; + private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory _tempDataFactory; + private Microsoft.AspNetCore.Mvc.Rendering.ViewContext _viewContext; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvokerCacheEntry _CacheEntry_k__BackingField; + public PageActionInvoker(Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.IPageHandlerMethodSelector handlerMethodSelector, System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor actionContextAccessor, Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.AspNetCore.Mvc.RazorPages.PageContext pageContext, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] filterMetadata, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvokerCacheEntry cacheEntry, Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder parameterBinder, Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory tempDataFactory, Microsoft.AspNetCore.Mvc.ViewFeatures.HtmlHelperOptions htmlHelperOptions) : base (default(System.Diagnostics.DiagnosticListener), default(Microsoft.Extensions.Logging.ILogger), default(Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor), default(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper), default(Microsoft.AspNetCore.Mvc.ActionContext), default(Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[]), default(System.Collections.Generic.IList)) { } + internal Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvokerCacheEntry CacheEntry { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + private bool HasPageModel { get { throw null; } } + internal Microsoft.AspNetCore.Mvc.RazorPages.PageContext PageContext { get { throw null; } } + private System.Threading.Tasks.Task BindArgumentsAsync() { throw null; } + protected override System.Threading.Tasks.Task InvokeInnerFilterAsync() { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + private System.Threading.Tasks.Task InvokeNextPageFilterAwaitedAsync() { throw null; } + protected override System.Threading.Tasks.Task InvokeResultAsync(Microsoft.AspNetCore.Mvc.IActionResult result) { throw null; } + private System.Threading.Tasks.Task Next(ref Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvoker.State next, ref Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvoker.Scope scope, ref object state, ref bool isCompleted) { throw null; } + private static object[] PrepareArguments(System.Collections.Generic.IDictionary argumentsInDictionary, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor handler) { throw null; } + protected override void ReleaseResources() { } + private static void Rethrow(Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutedContext context) { } + private Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor SelectHandler() { throw null; } + private enum Scope + { + Invoker = 0, + Page = 1, + } + private enum State + { + PageBegin = 0, + PageSelectHandlerBegin = 1, + PageSelectHandlerNext = 2, + PageSelectHandlerAsyncBegin = 3, + PageSelectHandlerAsyncEnd = 4, + PageSelectHandlerSync = 5, + PageSelectHandlerEnd = 6, + PageNext = 7, + PageAsyncBegin = 8, + PageAsyncEnd = 9, + PageSyncBegin = 10, + PageSyncEnd = 11, + PageInside = 12, + PageEnd = 13, + } + } + internal partial class PageActionInvokerCacheEntry + { + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor _ActionDescriptor_k__BackingField; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly Microsoft.AspNetCore.Mvc.Filters.FilterItem[] _CacheableFilters_k__BackingField; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerBinderDelegate[] _HandlerBinders_k__BackingField; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerExecutorDelegate[] _HandlerExecutors_k__BackingField; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly System.Func _ModelFactory_k__BackingField; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly System.Func _PageFactory_k__BackingField; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly System.Func _PropertyBinder_k__BackingField; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly System.Action _ReleaseModel_k__BackingField; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly System.Action _ReleasePage_k__BackingField; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly System.Func _ViewDataFactory_k__BackingField; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly System.Collections.Generic.IReadOnlyList> _ViewStartFactories_k__BackingField; + public PageActionInvokerCacheEntry(Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor actionDescriptor, System.Func viewDataFactory, System.Func pageFactory, System.Action releasePage, System.Func modelFactory, System.Action releaseModel, System.Func propertyBinder, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerExecutorDelegate[] handlerExecutors, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerBinderDelegate[] handlerBinders, System.Collections.Generic.IReadOnlyList> viewStartFactories, Microsoft.AspNetCore.Mvc.Filters.FilterItem[] cacheableFilters) { } + public Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor ActionDescriptor { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Mvc.Filters.FilterItem[] CacheableFilters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerBinderDelegate[] HandlerBinders { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerExecutorDelegate[] HandlerExecutors { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Func ModelFactory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Func PageFactory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Func PropertyBinder { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Action ReleaseModel { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Action ReleasePage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Func ViewDataFactory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.IReadOnlyList> ViewStartFactories { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + internal partial class PageActionInvokerProvider : Microsoft.AspNetCore.Mvc.Abstractions.IActionInvokerProvider + { + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor _actionContextAccessor; + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider _collectionProvider; + private volatile Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvokerProvider.InnerCache _currentCache; + private readonly System.Diagnostics.DiagnosticListener _diagnosticListener; + private readonly Microsoft.AspNetCore.Mvc.Filters.IFilterProvider[] _filterProviders; + private readonly Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageLoader _loader; + private readonly Microsoft.Extensions.Logging.ILogger _logger; + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper _mapper; + private readonly Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory _modelBinderFactory; + private readonly Microsoft.AspNetCore.Mvc.RazorPages.IPageModelFactoryProvider _modelFactoryProvider; + private readonly Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider _modelMetadataProvider; + private readonly Microsoft.AspNetCore.Mvc.MvcOptions _mvcOptions; + private readonly Microsoft.AspNetCore.Mvc.MvcViewOptions _mvcViewOptions; + private readonly Microsoft.AspNetCore.Mvc.RazorPages.IPageFactoryProvider _pageFactoryProvider; + private readonly Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder _parameterBinder; + private readonly Microsoft.AspNetCore.Mvc.Razor.IRazorPageFactoryProvider _razorPageFactoryProvider; + private readonly Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.IPageHandlerMethodSelector _selector; + private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory _tempDataFactory; + private readonly System.Collections.Generic.IReadOnlyList _valueProviderFactories; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly int _Order_k__BackingField; + public PageActionInvokerProvider(Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageLoader loader, Microsoft.AspNetCore.Mvc.RazorPages.IPageFactoryProvider pageFactoryProvider, Microsoft.AspNetCore.Mvc.RazorPages.IPageModelFactoryProvider modelFactoryProvider, Microsoft.AspNetCore.Mvc.Razor.IRazorPageFactoryProvider razorPageFactoryProvider, Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider collectionProvider, System.Collections.Generic.IEnumerable filterProviders, Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder parameterBinder, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory tempDataFactory, Microsoft.Extensions.Options.IOptions mvcOptions, Microsoft.Extensions.Options.IOptions mvcViewOptions, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.IPageHandlerMethodSelector selector, System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper) { } + public PageActionInvokerProvider(Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageLoader loader, Microsoft.AspNetCore.Mvc.RazorPages.IPageFactoryProvider pageFactoryProvider, Microsoft.AspNetCore.Mvc.RazorPages.IPageModelFactoryProvider modelFactoryProvider, Microsoft.AspNetCore.Mvc.Razor.IRazorPageFactoryProvider razorPageFactoryProvider, Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider collectionProvider, System.Collections.Generic.IEnumerable filterProviders, Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder parameterBinder, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory tempDataFactory, Microsoft.Extensions.Options.IOptions mvcOptions, Microsoft.Extensions.Options.IOptions mvcViewOptions, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.IPageHandlerMethodSelector selector, System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor actionContextAccessor) { } + private Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvokerProvider.InnerCache CurrentCache { get { throw null; } } + public int Order { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + private Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvoker CreateActionInvoker(Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvokerCacheEntry cacheEntry, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] filters) { throw null; } + private Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvokerCacheEntry CreateCacheEntry(Microsoft.AspNetCore.Mvc.Abstractions.ActionInvokerProviderContext context, Microsoft.AspNetCore.Mvc.Filters.FilterItem[] cachedFilters) { throw null; } + private Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerBinderDelegate[] GetHandlerBinders(Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor actionDescriptor) { throw null; } + private static Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerExecutorDelegate[] GetHandlerExecutors(Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor actionDescriptor) { throw null; } + internal System.Collections.Generic.List> GetViewStartFactories(Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor descriptor) { throw null; } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.Abstractions.ActionInvokerProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.Abstractions.ActionInvokerProviderContext context) { } + internal partial class InnerCache + { + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly System.Collections.Concurrent.ConcurrentDictionary _Entries_k__BackingField; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly int _Version_k__BackingField; + public InnerCache(int version) { } + public System.Collections.Concurrent.ConcurrentDictionary Entries { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public int Version { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + } + internal static partial class PageBinderFactory + { + internal static readonly Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerBinderDelegate NullHandlerBinder = (context, arguments) => System.Threading.Tasks.Task.CompletedTask; + internal static readonly System.Func NullPropertyBinder = (context, arguments) => System.Threading.Tasks.Task.CompletedTask; + public static Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerBinderDelegate CreateHandlerBinder(Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder parameterBinder, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor actionDescriptor, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor handler, Microsoft.AspNetCore.Mvc.MvcOptions mvcOptions) { throw null; } + public static System.Func CreatePropertyBinder(Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder parameterBinder, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor actionDescriptor) { throw null; } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + private readonly partial struct BinderItem + { + private readonly object _dummy; + public BinderItem(Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder modelBinder, Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata modelMetadata) { throw null; } + public Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder ModelBinder { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata ModelMetadata { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + } + internal delegate System.Threading.Tasks.Task PageHandlerBinderDelegate(Microsoft.AspNetCore.Mvc.RazorPages.PageContext pageContext, System.Collections.Generic.IDictionary arguments); +} +namespace Microsoft.Extensions.DependencyInjection +{ + internal partial class RazorPagesRazorViewEngineOptionsSetup : Microsoft.Extensions.Options.IConfigureOptions + { + private readonly Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptions _pagesOptions; + public RazorPagesRazorViewEngineOptionsSetup(Microsoft.Extensions.Options.IOptions pagesOptions) { } + private static string CombinePath(string path1, string path2) { throw null; } + public void Configure(Microsoft.AspNetCore.Mvc.Razor.RazorViewEngineOptions options) { } + } +} \ No newline at end of file diff --git a/src/Mvc/Mvc.RazorPages/src/Microsoft.AspNetCore.Mvc.RazorPages.csproj b/src/Mvc/Mvc.RazorPages/src/Microsoft.AspNetCore.Mvc.RazorPages.csproj index 0986fbcdb7f2..1f7fe61e41e0 100644 --- a/src/Mvc/Mvc.RazorPages/src/Microsoft.AspNetCore.Mvc.RazorPages.csproj +++ b/src/Mvc/Mvc.RazorPages/src/Microsoft.AspNetCore.Mvc.RazorPages.csproj @@ -11,6 +11,8 @@ + + diff --git a/src/Mvc/Mvc.RazorPages/test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj b/src/Mvc/Mvc.RazorPages/test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj index 3b4c6d6e7385..c4c209b50494 100644 --- a/src/Mvc/Mvc.RazorPages/test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj +++ b/src/Mvc/Mvc.RazorPages/test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj @@ -9,7 +9,9 @@ + + diff --git a/src/Mvc/Mvc.TagHelpers/src/Cache/CacheTagKey.cs b/src/Mvc/Mvc.TagHelpers/src/Cache/CacheTagKey.cs index bf327f30caf1..b90da105d2a3 100644 --- a/src/Mvc/Mvc.TagHelpers/src/Cache/CacheTagKey.cs +++ b/src/Mvc/Mvc.TagHelpers/src/Cache/CacheTagKey.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Globalization; using System.Text; +using Microsoft.AspNetCore.Antiforgery; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Razor.Infrastructure; using Microsoft.AspNetCore.Razor.TagHelpers; diff --git a/src/Mvc/Mvc.TagHelpers/src/Microsoft.AspNetCore.Mvc.TagHelpers.csproj b/src/Mvc/Mvc.TagHelpers/src/Microsoft.AspNetCore.Mvc.TagHelpers.csproj index f35047659898..b7ffd1af08ca 100644 --- a/src/Mvc/Mvc.TagHelpers/src/Microsoft.AspNetCore.Mvc.TagHelpers.csproj +++ b/src/Mvc/Mvc.TagHelpers/src/Microsoft.AspNetCore.Mvc.TagHelpers.csproj @@ -14,8 +14,9 @@ - + + diff --git a/src/Mvc/Mvc.TagHelpers/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj b/src/Mvc/Mvc.TagHelpers/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj index 32e1fe210785..fe40762689bb 100644 --- a/src/Mvc/Mvc.TagHelpers/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj +++ b/src/Mvc/Mvc.TagHelpers/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj @@ -9,7 +9,9 @@ + + diff --git a/src/Mvc/Mvc.ViewFeatures/ref/Directory.Build.props b/src/Mvc/Mvc.ViewFeatures/ref/Directory.Build.props new file mode 100644 index 000000000000..b500fb5d98e7 --- /dev/null +++ b/src/Mvc/Mvc.ViewFeatures/ref/Directory.Build.props @@ -0,0 +1,8 @@ + + + + + true + $(NoWarn);CS0169 + + \ No newline at end of file diff --git a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs new file mode 100644 index 000000000000..003d5bf8a81c --- /dev/null +++ b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs @@ -0,0 +1,265 @@ +// 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.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.RazorPages, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.TagHelpers, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.RazorPages.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.TagHelpers.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Views.TestCommon, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.ViewFeatures.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] + +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers +{ + internal partial class CharArrayBufferSource : Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ICharBufferSource + { + public static readonly Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.CharArrayBufferSource Instance; + public CharArrayBufferSource() { } + public char[] Rent(int bufferSize) { throw null; } + public void Return(char[] buffer) { } + } + internal partial interface ICharBufferSource + { + char[] Rent(int bufferSize); + void Return(char[] buffer); + } + internal partial class PagedCharBuffer + { + public const int PageSize = 1024; + private int _charIndex; + private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ICharBufferSource _BufferSource_k__BackingField; + private char[] _CurrentPage_k__BackingField; + private readonly System.Collections.Generic.List _Pages_k__BackingField; + public PagedCharBuffer(Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ICharBufferSource bufferSource) { } + public Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ICharBufferSource BufferSource { get { throw null; } } + private char[] CurrentPage { get { throw null; } set { } } + public int Length { get { throw null; } } + public System.Collections.Generic.List Pages { get { throw null; } } + public void Append(char value) { } + public void Append(char[] buffer, int index, int count) { } + public void Append(string value) { } + public void Clear() { } + public void Dispose() { } + private char[] GetCurrentPage() { throw null; } + private char[] NewPage() { throw null; } + } + internal partial class ViewBuffer : Microsoft.AspNetCore.Html.IHtmlContentBuilder + { + public static readonly int PartialViewPageSize; + public static readonly int TagHelperPageSize; + public static readonly int ViewComponentPageSize; + public static readonly int ViewPageSize; + private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.IViewBufferScope _bufferScope; + private Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferPage _currentPage; + private System.Collections.Generic.List _multiplePages; + private readonly string _name; + private readonly int _pageSize; + public ViewBuffer(Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.IViewBufferScope bufferScope, string name, int pageSize) { } + public int Count { get { throw null; } } + public Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferPage this[int index] { get { throw null; } } + private void AddPage(Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferPage page) { } + public Microsoft.AspNetCore.Html.IHtmlContentBuilder Append(string unencoded) { throw null; } + public Microsoft.AspNetCore.Html.IHtmlContentBuilder AppendHtml(Microsoft.AspNetCore.Html.IHtmlContent content) { throw null; } + public Microsoft.AspNetCore.Html.IHtmlContentBuilder AppendHtml(string encoded) { throw null; } + private Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferPage AppendNewPage() { throw null; } + private void AppendValue(Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferValue value) { } + public Microsoft.AspNetCore.Html.IHtmlContentBuilder Clear() { throw null; } + public void CopyTo(Microsoft.AspNetCore.Html.IHtmlContentBuilder destination) { } + private string DebuggerToString() { throw null; } + private Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferPage GetCurrentPage() { throw null; } + public void MoveTo(Microsoft.AspNetCore.Html.IHtmlContentBuilder destination) { } + private void MoveTo(Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBuffer destination) { } + public void WriteTo(System.IO.TextWriter writer, System.Text.Encodings.Web.HtmlEncoder encoder) { } + public System.Threading.Tasks.Task WriteToAsync(System.IO.TextWriter writer, System.Text.Encodings.Web.HtmlEncoder encoder) { throw null; } + private partial class EncodingWrapper + { + private readonly string _unencoded; + public EncodingWrapper(string unencoded) { } + public void WriteTo(System.IO.TextWriter writer, System.Text.Encodings.Web.HtmlEncoder encoder) { } + } + } + internal partial class ViewBufferTextWriter : System.IO.TextWriter + { + private readonly System.Text.Encodings.Web.HtmlEncoder _htmlEncoder; + private readonly System.IO.TextWriter _inner; + private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBuffer _Buffer_k__BackingField; + private readonly System.Text.Encoding _Encoding_k__BackingField; + private bool _Flushed_k__BackingField; + public ViewBufferTextWriter(Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBuffer buffer, System.Text.Encoding encoding) { } + public ViewBufferTextWriter(Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBuffer buffer, System.Text.Encoding encoding, System.Text.Encodings.Web.HtmlEncoder htmlEncoder, System.IO.TextWriter inner) { } + public Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBuffer Buffer { get { throw null; } } + public override System.Text.Encoding Encoding { get { throw null; } } + public bool Flushed { get { throw null; } private set { } } + public override void Flush() { } + public override System.Threading.Tasks.Task FlushAsync() { throw null; } + public void Write(Microsoft.AspNetCore.Html.IHtmlContent value) { } + public void Write(Microsoft.AspNetCore.Html.IHtmlContentContainer value) { } + public override void Write(char value) { } + public override void Write(char[] buffer, int index, int count) { } + public override void Write(object value) { } + public override void Write(string value) { } + public override System.Threading.Tasks.Task WriteAsync(char value) { throw null; } + public override System.Threading.Tasks.Task WriteAsync(char[] buffer, int index, int count) { throw null; } + public override System.Threading.Tasks.Task WriteAsync(string value) { throw null; } + public override void WriteLine() { } + public override void WriteLine(object value) { } + public override void WriteLine(string value) { } + public override System.Threading.Tasks.Task WriteLineAsync() { throw null; } + public override System.Threading.Tasks.Task WriteLineAsync(char value) { throw null; } + public override System.Threading.Tasks.Task WriteLineAsync(char[] value, int start, int offset) { throw null; } + public override System.Threading.Tasks.Task WriteLineAsync(string value) { throw null; } + } + internal partial class ViewBufferPage + { + private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferValue[] _Buffer_k__BackingField; + private int _Count_k__BackingField; + public ViewBufferPage(Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferValue[] buffer) { } + public Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferValue[] Buffer { get { throw null; } } + public int Capacity { get { throw null; } } + public int Count { get { throw null; } set { } } + public bool IsFull { get { throw null; } } + public void Append(Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferValue value) { } + } +} +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters +{ + internal partial class ViewDataAttributeApplicationModelProvider + { + public ViewDataAttributeApplicationModelProvider() { } + public int Order { get { throw null; } } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + } + internal static partial class ViewDataAttributePropertyProvider + { + public static System.Collections.Generic.IReadOnlyList GetViewDataProperties(System.Type type) { throw null; } + } + internal partial interface ISaveTempDataCallback + { + void OnTempDataSaving(Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary tempData); + } + internal partial interface IViewDataValuesProviderFeature + { + void ProvideViewDataValues(Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary viewData); + } + internal abstract partial class SaveTempDataPropertyFilterBase : Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.ISaveTempDataCallback + { + protected readonly Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory _tempDataFactory; + private readonly System.Collections.Generic.IDictionary _OriginalValues_k__BackingField; + private System.Collections.Generic.IReadOnlyList _Properties_k__BackingField; + private object _Subject_k__BackingField; + public SaveTempDataPropertyFilterBase(Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory tempDataFactory) { } + public System.Collections.Generic.IDictionary OriginalValues { get { throw null; } } + public System.Collections.Generic.IReadOnlyList Properties { get { throw null; } set { } } + public object Subject { get { throw null; } set { } } + public static System.Collections.Generic.IReadOnlyList GetTempDataProperties(Microsoft.AspNetCore.Mvc.ViewFeatures.Infrastructure.TempDataSerializer tempDataSerializer, System.Type type) { throw null; } + public void OnTempDataSaving(Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary tempData) { } + protected void SetPropertyValues(Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary tempData) { } + private static bool ValidateProperty(Microsoft.AspNetCore.Mvc.ViewFeatures.Infrastructure.TempDataSerializer tempDataSerializer, System.Collections.Generic.List errorMessages, System.Reflection.PropertyInfo property) { throw null; } + } + internal readonly partial struct LifecycleProperty + { + private readonly object _dummy; + private readonly int _dummyPrimitive; + public LifecycleProperty(System.Reflection.PropertyInfo propertyInfo, string key) { throw null; } + public string Key { get { throw null; } } + public System.Reflection.PropertyInfo PropertyInfo { get { throw null; } } + public object GetValue(object instance) { throw null; } + public void SetValue(object instance, object value) { } + } +} +namespace Microsoft.AspNetCore.Mvc.ViewFeatures +{ + internal partial class TempDataApplicationModelProvider + { + private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.Infrastructure.TempDataSerializer _tempDataSerializer; + public TempDataApplicationModelProvider(Microsoft.AspNetCore.Mvc.ViewFeatures.Infrastructure.TempDataSerializer tempDataSerializer) { } + public int Order { get { throw null; } } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + } + internal partial class NullView : Microsoft.AspNetCore.Mvc.ViewEngines.IView + { + public static readonly Microsoft.AspNetCore.Mvc.ViewFeatures.NullView Instance; + public NullView() { } + public string Path { get { throw null; } } + public System.Threading.Tasks.Task RenderAsync(Microsoft.AspNetCore.Mvc.Rendering.ViewContext context) { throw null; } + } + internal partial class TemplateRenderer + { + private const string DisplayTemplateViewPath = "DisplayTemplates"; + private const string EditorTemplateViewPath = "EditorTemplates"; + public const string IEnumerableOfIFormFileName = "IEnumerable`IFormFile"; + private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.IViewBufferScope _bufferScope; + private static readonly System.Collections.Generic.Dictionary> _defaultDisplayActions; + private static readonly System.Collections.Generic.Dictionary> _defaultEditorActions; + private readonly bool _readOnly; + private readonly string _templateName; + private readonly Microsoft.AspNetCore.Mvc.Rendering.ViewContext _viewContext; + private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary _viewData; + private readonly Microsoft.AspNetCore.Mvc.ViewEngines.IViewEngine _viewEngine; + public TemplateRenderer(Microsoft.AspNetCore.Mvc.ViewEngines.IViewEngine viewEngine, Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.IViewBufferScope bufferScope, Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext, Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary viewData, string templateName, bool readOnly) { } + private System.Collections.Generic.Dictionary> GetDefaultActions() { throw null; } + public static System.Collections.Generic.IEnumerable GetTypeNames(Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata modelMetadata, System.Type fieldType) { throw null; } + private System.Collections.Generic.IEnumerable GetViewNames() { throw null; } + private static Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper MakeHtmlHelper(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext, Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary viewData) { throw null; } + public Microsoft.AspNetCore.Html.IHtmlContent Render() { throw null; } + } + internal static partial class FormatWeekHelper + { + public static string GetFormattedWeek(Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer modelExplorer) { throw null; } + } + internal static partial class ViewDataDictionaryFactory + { + public static System.Func CreateFactory(System.Reflection.TypeInfo modelType) { throw null; } + public static System.Func CreateNestedFactory(System.Reflection.TypeInfo modelType) { throw null; } + } +} +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Infrastructure +{ + internal partial class DefaultTempDataSerializer : Microsoft.AspNetCore.Mvc.ViewFeatures.Infrastructure.TempDataSerializer + { + public DefaultTempDataSerializer() { } + public override bool CanSerializeType(System.Type type) { throw null; } + public override System.Collections.Generic.IDictionary Deserialize(byte[] value) { throw null; } + private static object DeserializeArray(in System.Text.Json.JsonElement arrayElement) { throw null; } + private System.Collections.Generic.IDictionary DeserializeDictionary(System.Text.Json.JsonElement rootElement) { throw null; } + private static object DeserializeDictionaryEntry(in System.Text.Json.JsonElement objectElement) { throw null; } + public override byte[] Serialize(System.Collections.Generic.IDictionary values) { throw null; } + } +} +namespace Microsoft.AspNetCore.Mvc.Rendering +{ + internal partial class SystemTextJsonHelper : Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper + { + private readonly System.Text.Json.JsonSerializerOptions _htmlSafeJsonSerializerOptions; + public SystemTextJsonHelper(Microsoft.Extensions.Options.IOptions options) { } + private static System.Text.Json.JsonSerializerOptions GetHtmlSafeSerializerOptions(System.Text.Json.JsonSerializerOptions serializerOptions) { throw null; } + public Microsoft.AspNetCore.Html.IHtmlContent Serialize(object value) { throw null; } + } +} +namespace Microsoft.Extensions.DependencyInjection +{ + internal partial class MvcViewOptionsSetup + { + private readonly Microsoft.Extensions.Options.IOptions _dataAnnotationsLocalizationOptions; + private readonly Microsoft.Extensions.Localization.IStringLocalizerFactory _stringLocalizerFactory; + private readonly Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider _validationAttributeAdapterProvider; + public MvcViewOptionsSetup(Microsoft.Extensions.Options.IOptions dataAnnotationLocalizationOptions, Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider validationAttributeAdapterProvider) { } + public MvcViewOptionsSetup(Microsoft.Extensions.Options.IOptions dataAnnotationOptions, Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider validationAttributeAdapterProvider, Microsoft.Extensions.Localization.IStringLocalizerFactory stringLocalizerFactory) { } + public void Configure(Microsoft.AspNetCore.Mvc.MvcViewOptions options) { } + } + internal partial class TempDataMvcOptionsSetup + { + public TempDataMvcOptionsSetup() { } + public void Configure(Microsoft.AspNetCore.Mvc.MvcOptions options) { } + } +} \ No newline at end of file diff --git a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj index ede007ec0cae..5d21f0ed988b 100644 --- a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj +++ b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj @@ -5,6 +5,7 @@ + diff --git a/src/Mvc/Mvc.ViewFeatures/src/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj b/src/Mvc/Mvc.ViewFeatures/src/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj index 90f5f2fcc8bd..17a509016927 100644 --- a/src/Mvc/Mvc.ViewFeatures/src/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj +++ b/src/Mvc/Mvc.ViewFeatures/src/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj @@ -31,9 +31,10 @@ - - - + + + + diff --git a/src/Mvc/Mvc.ViewFeatures/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj b/src/Mvc/Mvc.ViewFeatures/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj index 5cfbdb8ff4bc..20555a966d55 100644 --- a/src/Mvc/Mvc.ViewFeatures/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj +++ b/src/Mvc/Mvc.ViewFeatures/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj @@ -7,5 +7,7 @@ + + diff --git a/src/Mvc/test/Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj b/src/Mvc/test/Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj index 0e33905acc8d..baf0fa44c00d 100644 --- a/src/Mvc/test/Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj +++ b/src/Mvc/test/Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj @@ -7,6 +7,7 @@ + diff --git a/src/Antiforgery/src/Internal/CryptographyAlgorithms.cs b/src/Shared/CryptographyAlgorithms/CryptographyAlgorithms.cs similarity index 100% rename from src/Antiforgery/src/Internal/CryptographyAlgorithms.cs rename to src/Shared/CryptographyAlgorithms/CryptographyAlgorithms.cs From fd9926a40f3c1253f2668e09a2a86df4cf979cb2 Mon Sep 17 00:00:00 2001 From: John Luo Date: Fri, 11 Oct 2019 11:18:12 -0700 Subject: [PATCH 031/116] Middleware --- .../Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj b/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj index e6c8278b3039..0cc9e2e73ecb 100644 --- a/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj +++ b/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj @@ -26,6 +26,7 @@ + From d19dffd7ff226384710902a75ea0a35463b62bf9 Mon Sep 17 00:00:00 2001 From: John Luo Date: Fri, 11 Oct 2019 14:26:33 -0700 Subject: [PATCH 032/116] SignalR --- ...Core.SignalR.Client.FunctionalTests.csproj | 2 + ...oft.AspNetCore.SignalR.Client.Tests.csproj | 3 ++ ...e.Http.Connections.Client.netcoreapp3.0.cs | 49 ------------------- src/SignalR/common/Shared/PipeWriterStream.cs | 5 +- .../SignalRDependencyInjectionExtensions.cs | 1 - .../SignalR/test/HubConnectionHandlerTests.cs | 1 - .../Microsoft.AspNetCore.SignalR.Tests.csproj | 4 ++ ...re.SignalR.StackExchangeRedis.Tests.csproj | 3 ++ 8 files changed, 13 insertions(+), 55 deletions(-) delete mode 100644 src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netcoreapp3.0.cs diff --git a/src/SignalR/clients/csharp/Client/test/FunctionalTests/Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj b/src/SignalR/clients/csharp/Client/test/FunctionalTests/Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj index 8280917fc758..0463669e2bc9 100644 --- a/src/SignalR/clients/csharp/Client/test/FunctionalTests/Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj +++ b/src/SignalR/clients/csharp/Client/test/FunctionalTests/Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj @@ -9,6 +9,8 @@ + + diff --git a/src/SignalR/clients/csharp/Client/test/UnitTests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj b/src/SignalR/clients/csharp/Client/test/UnitTests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj index cc45556edd00..4f6ea2d63d0d 100644 --- a/src/SignalR/clients/csharp/Client/test/UnitTests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj +++ b/src/SignalR/clients/csharp/Client/test/UnitTests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj @@ -16,6 +16,9 @@ + + + diff --git a/src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netcoreapp3.0.cs b/src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netcoreapp3.0.cs deleted file mode 100644 index 35b6c7cc3579..000000000000 --- a/src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netcoreapp3.0.cs +++ /dev/null @@ -1,49 +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 Microsoft.AspNetCore.Http.Connections.Client -{ - public partial class HttpConnection : Microsoft.AspNetCore.Connections.ConnectionContext, Microsoft.AspNetCore.Connections.Features.IConnectionInherentKeepAliveFeature - { - public HttpConnection(Microsoft.AspNetCore.Http.Connections.Client.HttpConnectionOptions httpConnectionOptions, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } - public HttpConnection(System.Uri url) { } - public HttpConnection(System.Uri url, Microsoft.AspNetCore.Http.Connections.HttpTransportType transports) { } - public HttpConnection(System.Uri url, Microsoft.AspNetCore.Http.Connections.HttpTransportType transports, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } - public override string ConnectionId { get { throw null; } set { } } - public override Microsoft.AspNetCore.Http.Features.IFeatureCollection Features { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public override System.Collections.Generic.IDictionary Items { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - bool Microsoft.AspNetCore.Connections.Features.IConnectionInherentKeepAliveFeature.HasInherentKeepAlive { get { throw null; } } - public override System.IO.Pipelines.IDuplexPipe Transport { get { throw null; } set { } } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.ValueTask DisposeAsync() { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task StartAsync(Microsoft.AspNetCore.Connections.TransferFormat transferFormat, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public System.Threading.Tasks.Task StartAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - } - public partial class HttpConnectionOptions - { - public HttpConnectionOptions() { } - public System.Func> AccessTokenProvider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Security.Cryptography.X509Certificates.X509CertificateCollection ClientCertificates { get { throw null; } set { } } - public System.TimeSpan CloseTimeout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Net.CookieContainer Cookies { get { throw null; } set { } } - public System.Net.ICredentials Credentials { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IDictionary Headers { get { throw null; } set { } } - public System.Func HttpMessageHandlerFactory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Net.IWebProxy Proxy { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool SkipNegotiation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Http.Connections.HttpTransportType Transports { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Uri Url { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool? UseDefaultCredentials { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Action WebSocketConfiguration { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial class NoTransportSupportedException : System.Exception - { - public NoTransportSupportedException(string message) { } - } - public partial class TransportFailedException : System.Exception - { - public TransportFailedException(string transportType, string message, System.Exception innerException = null) { } - public string TransportType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } -} diff --git a/src/SignalR/common/Shared/PipeWriterStream.cs b/src/SignalR/common/Shared/PipeWriterStream.cs index c569d09ed2d1..ec72d5fdc23a 100644 --- a/src/SignalR/common/Shared/PipeWriterStream.cs +++ b/src/SignalR/common/Shared/PipeWriterStream.cs @@ -1,12 +1,9 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Buffers; -using System.IO; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Internal; namespace System.IO.Pipelines { diff --git a/src/SignalR/server/SignalR/src/SignalRDependencyInjectionExtensions.cs b/src/SignalR/server/SignalR/src/SignalRDependencyInjectionExtensions.cs index a7ec1211547c..1f8bdc92c947 100644 --- a/src/SignalR/server/SignalR/src/SignalRDependencyInjectionExtensions.cs +++ b/src/SignalR/server/SignalR/src/SignalRDependencyInjectionExtensions.cs @@ -4,7 +4,6 @@ using System; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.SignalR; -using Microsoft.AspNetCore.SignalR.Internal; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Options; diff --git a/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs b/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs index 9a45f00e6878..6284a75515b4 100644 --- a/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs +++ b/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs @@ -16,7 +16,6 @@ using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Connections.Features; -using Microsoft.AspNetCore.Http.Connections.Internal; using Microsoft.AspNetCore.SignalR.Internal; using Microsoft.AspNetCore.SignalR.Protocol; using Microsoft.Extensions.DependencyInjection; diff --git a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests.csproj b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests.csproj index 527ae19b1945..741d9fb15534 100644 --- a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests.csproj +++ b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests.csproj @@ -16,7 +16,11 @@ + + + + diff --git a/src/SignalR/server/StackExchangeRedis/test/Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests.csproj b/src/SignalR/server/StackExchangeRedis/test/Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests.csproj index 8172acf1f6ed..a2f5905d73ca 100644 --- a/src/SignalR/server/StackExchangeRedis/test/Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests.csproj +++ b/src/SignalR/server/StackExchangeRedis/test/Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests.csproj @@ -10,6 +10,9 @@ + + + From 6f6d22edb6821806a11617a7deaaf2a54c679173 Mon Sep 17 00:00:00 2001 From: John Luo Date: Fri, 11 Oct 2019 14:49:43 -0700 Subject: [PATCH 033/116] Identity --- .../Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj b/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj index 9ed81cbcb856..b0a947b17697 100644 --- a/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj +++ b/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj @@ -17,6 +17,7 @@ + @@ -26,7 +27,7 @@ <_Parameter1>Microsoft.AspNetCore.Testing.DefaultUIProjectPath <_Parameter2>$([System.IO.Path]::GetDirectoryName('%(_IdentitUIDefaultUI.MSBuildSourceProjectFile)')) - + From e67cdd678cee1d227538d2e149b82af3456e4e44 Mon Sep 17 00:00:00 2001 From: John Luo Date: Fri, 11 Oct 2019 15:05:11 -0700 Subject: [PATCH 034/116] Components --- ...icrosoft.AspNetCore.Components.Authorization.Tests.csproj | 1 + .../test/Microsoft.AspNetCore.Blazor.Build.Tests.csproj | 1 + .../test/Microsoft.AspNetCore.Components.Forms.Tests.csproj | 1 + .../test/Microsoft.AspNetCore.Components.Server.Tests.csproj | 1 + .../E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj | 5 +++-- src/Components/test/Ignitor.Test/Ignitor.Test.csproj | 1 + .../test/testassets/BasicTestApp/BasicTestApp.csproj | 1 + .../ComponentsApp.Server/ComponentsApp.Server.csproj | 1 + src/Components/test/testassets/Ignitor/Ignitor.csproj | 1 + .../test/testassets/TestServer/Components.TestServer.csproj | 1 + 10 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Components/Authorization/test/Microsoft.AspNetCore.Components.Authorization.Tests.csproj b/src/Components/Authorization/test/Microsoft.AspNetCore.Components.Authorization.Tests.csproj index fedc3e7a4e36..024f4386e6b2 100644 --- a/src/Components/Authorization/test/Microsoft.AspNetCore.Components.Authorization.Tests.csproj +++ b/src/Components/Authorization/test/Microsoft.AspNetCore.Components.Authorization.Tests.csproj @@ -6,6 +6,7 @@ + diff --git a/src/Components/Blazor/Build/test/Microsoft.AspNetCore.Blazor.Build.Tests.csproj b/src/Components/Blazor/Build/test/Microsoft.AspNetCore.Blazor.Build.Tests.csproj index 0263c9f8004a..b79b049cd041 100644 --- a/src/Components/Blazor/Build/test/Microsoft.AspNetCore.Blazor.Build.Tests.csproj +++ b/src/Components/Blazor/Build/test/Microsoft.AspNetCore.Blazor.Build.Tests.csproj @@ -23,6 +23,7 @@ + diff --git a/src/Components/Forms/test/Microsoft.AspNetCore.Components.Forms.Tests.csproj b/src/Components/Forms/test/Microsoft.AspNetCore.Components.Forms.Tests.csproj index e78bb47ed33c..c5402913c93b 100644 --- a/src/Components/Forms/test/Microsoft.AspNetCore.Components.Forms.Tests.csproj +++ b/src/Components/Forms/test/Microsoft.AspNetCore.Components.Forms.Tests.csproj @@ -6,6 +6,7 @@ + diff --git a/src/Components/Server/test/Microsoft.AspNetCore.Components.Server.Tests.csproj b/src/Components/Server/test/Microsoft.AspNetCore.Components.Server.Tests.csproj index 4e8dfbf7f24c..8dd140b8eb5c 100644 --- a/src/Components/Server/test/Microsoft.AspNetCore.Components.Server.Tests.csproj +++ b/src/Components/Server/test/Microsoft.AspNetCore.Components.Server.Tests.csproj @@ -5,6 +5,7 @@ + diff --git a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj index 6b91b2d230c9..6054a58fe875 100644 --- a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj +++ b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj @@ -9,13 +9,13 @@ false - + true - + false @@ -27,6 +27,7 @@ + diff --git a/src/Components/test/Ignitor.Test/Ignitor.Test.csproj b/src/Components/test/Ignitor.Test/Ignitor.Test.csproj index ad35b17b424b..5852da3e88ea 100644 --- a/src/Components/test/Ignitor.Test/Ignitor.Test.csproj +++ b/src/Components/test/Ignitor.Test/Ignitor.Test.csproj @@ -6,6 +6,7 @@ + diff --git a/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj b/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj index ac0e53051620..6092ae25e9cf 100644 --- a/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj +++ b/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj @@ -16,6 +16,7 @@ + diff --git a/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj b/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj index 52a6e6206c86..75ee03eb2339 100644 --- a/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj +++ b/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj @@ -6,6 +6,7 @@ + diff --git a/src/Components/test/testassets/Ignitor/Ignitor.csproj b/src/Components/test/testassets/Ignitor/Ignitor.csproj index 6816e44df150..cebb3b5e9337 100644 --- a/src/Components/test/testassets/Ignitor/Ignitor.csproj +++ b/src/Components/test/testassets/Ignitor/Ignitor.csproj @@ -9,6 +9,7 @@ + diff --git a/src/Components/test/testassets/TestServer/Components.TestServer.csproj b/src/Components/test/testassets/TestServer/Components.TestServer.csproj index 62b354608a3d..39d07a09e7f5 100644 --- a/src/Components/test/testassets/TestServer/Components.TestServer.csproj +++ b/src/Components/test/testassets/TestServer/Components.TestServer.csproj @@ -8,6 +8,7 @@ + From 38239d31b855450e944105df1c45821cd0df97f2 Mon Sep 17 00:00:00 2001 From: John Luo Date: Fri, 11 Oct 2019 15:30:41 -0700 Subject: [PATCH 035/116] Cleanup --- .../benchmarks/IIS.Performance/IIS.Performance.csproj | 1 + .../IIS/samples/NativeIISSample/NativeIISSample.csproj | 1 + .../test/IIS.FunctionalTests/IIS.FunctionalTests.csproj | 1 + .../IIS.NewHandler.FunctionalTests.csproj | 1 + .../IIS.NewShim.FunctionalTests.csproj | 1 + src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj | 1 + .../IISExpress.FunctionalTests.csproj | 1 + .../IIS.Common.TestLib/IIS.Common.TestLib.csproj | 1 + .../Microsoft.AspNetCore.Server.Kestrel.Core.Manual.cs | 9 --------- .../ServerComparison.FunctionalTests.csproj | 1 + 10 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj b/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj index 44c1a66221f1..8447e433a7cd 100644 --- a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj +++ b/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj @@ -34,6 +34,7 @@ + diff --git a/src/Servers/IIS/IIS/samples/NativeIISSample/NativeIISSample.csproj b/src/Servers/IIS/IIS/samples/NativeIISSample/NativeIISSample.csproj index 7bc7433b75a4..cbd0d09765ad 100644 --- a/src/Servers/IIS/IIS/samples/NativeIISSample/NativeIISSample.csproj +++ b/src/Servers/IIS/IIS/samples/NativeIISSample/NativeIISSample.csproj @@ -11,6 +11,7 @@ + diff --git a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj index d7d6ba4fc547..0dc360611da5 100644 --- a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj @@ -24,6 +24,7 @@ + diff --git a/src/Servers/IIS/IIS/test/IIS.NewHandler.FunctionalTests/IIS.NewHandler.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.NewHandler.FunctionalTests/IIS.NewHandler.FunctionalTests.csproj index 8720dcd37c9e..e2d4b3d4bab4 100644 --- a/src/Servers/IIS/IIS/test/IIS.NewHandler.FunctionalTests/IIS.NewHandler.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.NewHandler.FunctionalTests/IIS.NewHandler.FunctionalTests.csproj @@ -30,6 +30,7 @@ + diff --git a/src/Servers/IIS/IIS/test/IIS.NewShim.FunctionalTests/IIS.NewShim.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.NewShim.FunctionalTests/IIS.NewShim.FunctionalTests.csproj index 67b66fdea0c7..f15ea5e4664b 100644 --- a/src/Servers/IIS/IIS/test/IIS.NewShim.FunctionalTests/IIS.NewShim.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.NewShim.FunctionalTests/IIS.NewShim.FunctionalTests.csproj @@ -25,6 +25,7 @@ + diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj b/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj index cb9fc52dc152..ae9fdaae3dd5 100644 --- a/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj @@ -16,6 +16,7 @@ + diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj index 77d557ad873b..b4f2c33a69a5 100644 --- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj @@ -27,6 +27,7 @@ + diff --git a/src/Servers/IIS/IIS/test/testassets/IIS.Common.TestLib/IIS.Common.TestLib.csproj b/src/Servers/IIS/IIS/test/testassets/IIS.Common.TestLib/IIS.Common.TestLib.csproj index 593ef0fbed2c..339da8e16df5 100644 --- a/src/Servers/IIS/IIS/test/testassets/IIS.Common.TestLib/IIS.Common.TestLib.csproj +++ b/src/Servers/IIS/IIS/test/testassets/IIS.Common.TestLib/IIS.Common.TestLib.csproj @@ -7,6 +7,7 @@ + diff --git a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.Manual.cs b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.Manual.cs index c56f35173514..3027febf33d4 100644 --- a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.Manual.cs +++ b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.Manual.cs @@ -3,16 +3,7 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Libuv.FunctionalTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Sockets.FunctionalTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("InMemory.FunctionalTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Sockets.BindTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Libuv.BindTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Core.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Performance, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal diff --git a/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj b/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj index 49e4b3a9a769..0d521a586ede 100644 --- a/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj +++ b/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj @@ -17,6 +17,7 @@ + From e2b4ca10fe98e6226fcaf4f199e2e6e38a89f0fb Mon Sep 17 00:00:00 2001 From: John Luo Date: Sat, 12 Oct 2019 23:00:30 -0700 Subject: [PATCH 036/116] Cleanup 2 --- ...hentication.AzureAD.FunctionalTests.csproj | 2 ++ ...soft.AspNetCore.Components.E2ETests.csproj | 4 ++++ .../BasicTestApp/BasicTestApp.csproj | 1 + .../ComponentsApp.Server.csproj | 2 ++ .../TestServer/Components.TestServer.csproj | 2 ++ ...AspNetCore.Cryptography.Internal.Manual.cs | 5 ---- ...ft.AspNetCore.Cryptography.Internal.csproj | 2 +- ...icrosoft.AspNetCore.FunctionalTests.csproj | 1 + ....AspNetCore.Hosting.FunctionalTests.csproj | 1 + ...AspNetCore.Identity.FunctionalTests.csproj | 2 ++ .../Diagnostics.FunctionalTests.csproj | 1 + ...crosoft.AspNetCore.WebSockets.Tests.csproj | 1 + ...oft.AspNetCore.Mvc.ApiExplorer.Test.csproj | 1 + .../Microsoft.AspNetCore.Mvc.Core.Test.csproj | 1 + src/Mvc/Mvc.Cors/ref/Directory.Build.props | 7 ------ .../Microsoft.AspNetCore.Mvc.Cors.Manual.cs | 23 ------------------- .../ref/Microsoft.AspNetCore.Mvc.Cors.csproj | 1 - .../Microsoft.AspNetCore.Mvc.Cors.Test.csproj | 1 + ...t.AspNetCore.Mvc.DataAnnotations.Manual.cs | 9 -------- ...ft.AspNetCore.Mvc.Localization.Test.csproj | 2 ++ ....AspNetCore.Mvc.NewtonsoftJson.Test.csproj | 2 ++ ...e.Mvc.Razor.RuntimeCompilation.Test.csproj | 5 ++++ .../Microsoft.AspNetCore.Mvc.Razor.Manual.cs | 7 ------ ...Microsoft.AspNetCore.Mvc.Razor.Test.csproj | 3 +++ ...ore.Mvc.RazorPages.netcoreapp3.0.Manual.cs | 4 ---- ...AspNetCore.Mvc.RazorPages.netcoreapp3.0.cs | 2 +- ...soft.AspNetCore.Mvc.RazorPages.Test.csproj | 4 ++++ ...soft.AspNetCore.Mvc.TagHelpers.Test.csproj | 3 +++ .../ref/Directory.Build.props | 1 - ...soft.AspNetCore.Mvc.ViewFeatures.Manual.cs | 8 ------- ...ft.AspNetCore.Mvc.ViewFeatures.Test.csproj | 1 + .../test/Microsoft.AspNetCore.Mvc.Test.csproj | 5 ++++ ...icrosoft.AspNetCore.Mvc.Performance.csproj | 1 + ...oft.AspNetCore.Mvc.Views.TestCommon.csproj | 2 ++ ...soft.AspNetCore.Mvc.FunctionalTests.csproj | 6 +++++ ...oft.AspNetCore.Mvc.IntegrationTests.csproj | 2 ++ .../AuthSamples.FunctionalTests.csproj | 6 ++++- ...Core.SignalR.Client.FunctionalTests.csproj | 2 ++ ...oft.AspNetCore.SignalR.Client.Tests.csproj | 1 + ...t.AspNetCore.Http.Connections.Tests.csproj | 2 ++ ...oft.AspNetCore.SignalR.Common.Tests.csproj | 1 + ....AspNetCore.SignalR.Microbenchmarks.csproj | 2 ++ .../Microsoft.AspNetCore.SignalR.Tests.csproj | 3 +++ ...re.SignalR.StackExchangeRedis.Tests.csproj | 3 +++ 44 files changed, 77 insertions(+), 68 deletions(-) delete mode 100644 src/Mvc/Mvc.Cors/ref/Directory.Build.props delete mode 100644 src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.Manual.cs diff --git a/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj b/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj index b13ff3e5f8e9..c8dd4f20e12c 100644 --- a/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj +++ b/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj @@ -15,6 +15,8 @@ + + diff --git a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj index 6054a58fe875..a9d70ce0f827 100644 --- a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj +++ b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj @@ -28,7 +28,11 @@ + + + + diff --git a/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj b/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj index 6092ae25e9cf..9e56292e5a58 100644 --- a/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj +++ b/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj @@ -18,6 +18,7 @@ + diff --git a/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj b/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj index 75ee03eb2339..3b4a2a086ff9 100644 --- a/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj +++ b/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj @@ -7,7 +7,9 @@ + + diff --git a/src/Components/test/testassets/TestServer/Components.TestServer.csproj b/src/Components/test/testassets/TestServer/Components.TestServer.csproj index 39d07a09e7f5..8b1ba281c700 100644 --- a/src/Components/test/testassets/TestServer/Components.TestServer.csproj +++ b/src/Components/test/testassets/TestServer/Components.TestServer.csproj @@ -9,7 +9,9 @@ + + diff --git a/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.Manual.cs b/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.Manual.cs index 6f9ef2dd9de9..8120f4169951 100644 --- a/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.Manual.cs +++ b/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.Manual.cs @@ -5,13 +5,8 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Cryptography.Internal.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Cryptography.KeyDerivation, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Cryptography.KeyDerivation.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.DataProtection, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.DataProtection.Abstractions.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.DataProtection.Extensions.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.DataProtection.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] namespace Microsoft.AspNetCore.Cryptography { diff --git a/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj b/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj index 0512d98b0d61..0374fb7c6d1e 100644 --- a/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj +++ b/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj @@ -6,6 +6,6 @@ - + diff --git a/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj index efef69f71352..8483f3e5c613 100644 --- a/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj +++ b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj @@ -26,6 +26,7 @@ + diff --git a/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj b/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj index c848da3647bf..1bd62691e074 100644 --- a/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj +++ b/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj @@ -20,6 +20,7 @@ + diff --git a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj index 534f1b50a5cb..db7f44026e8e 100644 --- a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj +++ b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj @@ -22,6 +22,8 @@ + + diff --git a/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj b/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj index 4c8951746c3d..3532e1860838 100644 --- a/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj +++ b/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj @@ -17,6 +17,7 @@ + diff --git a/src/Middleware/WebSockets/test/UnitTests/Microsoft.AspNetCore.WebSockets.Tests.csproj b/src/Middleware/WebSockets/test/UnitTests/Microsoft.AspNetCore.WebSockets.Tests.csproj index 42aefeaebdfd..abd367de2bd3 100644 --- a/src/Middleware/WebSockets/test/UnitTests/Microsoft.AspNetCore.WebSockets.Tests.csproj +++ b/src/Middleware/WebSockets/test/UnitTests/Microsoft.AspNetCore.WebSockets.Tests.csproj @@ -7,6 +7,7 @@ + diff --git a/src/Mvc/Mvc.ApiExplorer/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj b/src/Mvc/Mvc.ApiExplorer/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj index 5e385ecd7a1b..d67450b16ef1 100644 --- a/src/Mvc/Mvc.ApiExplorer/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj +++ b/src/Mvc/Mvc.ApiExplorer/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj @@ -6,6 +6,7 @@ + diff --git a/src/Mvc/Mvc.Core/test/Microsoft.AspNetCore.Mvc.Core.Test.csproj b/src/Mvc/Mvc.Core/test/Microsoft.AspNetCore.Mvc.Core.Test.csproj index 09cf199474c5..956ef5fb6879 100644 --- a/src/Mvc/Mvc.Core/test/Microsoft.AspNetCore.Mvc.Core.Test.csproj +++ b/src/Mvc/Mvc.Core/test/Microsoft.AspNetCore.Mvc.Core.Test.csproj @@ -11,6 +11,7 @@ + diff --git a/src/Mvc/Mvc.Cors/ref/Directory.Build.props b/src/Mvc/Mvc.Cors/ref/Directory.Build.props deleted file mode 100644 index ea5de23302dc..000000000000 --- a/src/Mvc/Mvc.Cors/ref/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - $(NoWarn);CS0169 - - \ No newline at end of file diff --git a/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.Manual.cs b/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.Manual.cs deleted file mode 100644 index e76fd634d7a7..000000000000 --- a/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.Manual.cs +++ /dev/null @@ -1,23 +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.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Core.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Cors.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] - -namespace Microsoft.AspNetCore.Mvc.Cors -{ - internal partial class CorsApplicationModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelProvider - { - private readonly Microsoft.AspNetCore.Mvc.MvcOptions _mvcOptions; - public CorsApplicationModelProvider(Microsoft.Extensions.Options.IOptions mvcOptions) { } - public int Order { get { throw null; } } - private static void ConfigureCorsActionConstraint(Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel actionModel) { } - private static void ConfigureCorsEndpointMetadata(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModel applicationModel) { } - private static void ConfigureCorsFilters(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } - public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } - public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } - } -} \ No newline at end of file diff --git a/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.csproj b/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.csproj index ad611123a34c..a3bf5f99a621 100644 --- a/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.csproj +++ b/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.csproj @@ -5,7 +5,6 @@ - diff --git a/src/Mvc/Mvc.Cors/test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj b/src/Mvc/Mvc.Cors/test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj index ce15e8efbc76..1ff316ccca36 100644 --- a/src/Mvc/Mvc.Cors/test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj +++ b/src/Mvc/Mvc.Cors/test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj @@ -5,6 +5,7 @@ + diff --git a/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.Manual.cs b/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.Manual.cs index e36f2600fc93..355dbe4c15b3 100644 --- a/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.Manual.cs +++ b/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.Manual.cs @@ -5,15 +5,6 @@ [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.ViewFeatures, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.DataAnnotations.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Core.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Core.TestCommon, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.IntegrationTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.ViewFeatures.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] - -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Performance, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] - namespace Microsoft.AspNetCore.Mvc.DataAnnotations { internal partial class DataAnnotationsMetadataProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IBindingMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IDisplayMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IMetadataDetailsProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IValidationMetadataProvider diff --git a/src/Mvc/Mvc.Localization/test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj b/src/Mvc/Mvc.Localization/test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj index db22eeedb5b2..ebb1452de0a6 100644 --- a/src/Mvc/Mvc.Localization/test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj +++ b/src/Mvc/Mvc.Localization/test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj @@ -5,6 +5,8 @@ + + diff --git a/src/Mvc/Mvc.NewtonsoftJson/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test.csproj b/src/Mvc/Mvc.NewtonsoftJson/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test.csproj index ddac8c696127..8b73ef8f9499 100644 --- a/src/Mvc/Mvc.NewtonsoftJson/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test.csproj +++ b/src/Mvc/Mvc.NewtonsoftJson/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test.csproj @@ -7,7 +7,9 @@ + + diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj index 49674d70ce2e..77ce94f1a6e7 100644 --- a/src/Mvc/Mvc.Razor.RuntimeCompilation/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj +++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj @@ -6,8 +6,13 @@ + + + + + diff --git a/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.Manual.cs b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.Manual.cs index 99b132f94339..7af6b7388acb 100644 --- a/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.Manual.cs +++ b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.Manual.cs @@ -6,13 +6,6 @@ [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.RazorPages, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.TagHelpers, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] - -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.RazorPages.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.TagHelpers.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] - [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] namespace Microsoft.AspNetCore.Mvc.ApplicationParts diff --git a/src/Mvc/Mvc.Razor/test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj b/src/Mvc/Mvc.Razor/test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj index aa9e607e3bdf..6865ebf428c9 100644 --- a/src/Mvc/Mvc.Razor/test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj +++ b/src/Mvc/Mvc.Razor/test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj @@ -14,7 +14,10 @@ + + + diff --git a/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.Manual.cs b/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.Manual.cs index b701801f9f31..912d7222b062 100644 --- a/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.Manual.cs +++ b/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.Manual.cs @@ -5,10 +5,6 @@ [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.IntegrationTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.RazorPages.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] - namespace Microsoft.AspNetCore.Builder { internal partial class CompiledPageRouteModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IPageRouteModelProvider diff --git a/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.cs b/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.cs index e8959d832abf..6bf3847a86e7 100644 --- a/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.cs +++ b/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.cs @@ -694,7 +694,7 @@ public PageModelAttribute() { } } public partial class PageResultExecutor : Microsoft.AspNetCore.Mvc.ViewFeatures.ViewExecutor { - public PageResultExecutor(Microsoft.AspNetCore.Mvc.Infrastructure.IHttpResponseStreamWriterFactory writerFactory, Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine compositeViewEngine, Microsoft.AspNetCore.Mvc.Razor.IRazorViewEngine razorViewEngine, Microsoft.AspNetCore.Mvc.Razor.IRazorPageActivator razorPageActivator, System.Diagnostics.DiagnosticListener diagnosticListener, System.Text.Encodings.Web.HtmlEncoder htmlEncoder) : base (default(Microsoft.Extensions.Options.IOptions), default(Microsoft.AspNetCore.Mvc.Infrastructure.IHttpResponseStreamWriterFactory), default(Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine), default(Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory), default(System.Diagnostics.DiagnosticListener), default(Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider)) { } + public PageResultExecutor(Microsoft.AspNetCore.Mvc.Infrastructure.IHttpResponseStreamWriterFactory writerFactory, Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine compositeViewEngine, Microsoft.AspNetCore.Mvc.Razor.IRazorViewEngine razorViewEngine, Microsoft.AspNetCore.Mvc.Razor.IRazorPageActivator razorPageActivator, System.Diagnostics.DiagnosticListener diagnosticListener, System.Text.Encodings.Web.HtmlEncoder htmlEncoder) : base (default(Microsoft.AspNetCore.Mvc.Infrastructure.IHttpResponseStreamWriterFactory), default(Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine), default(System.Diagnostics.DiagnosticListener)) { } public virtual System.Threading.Tasks.Task ExecuteAsync(Microsoft.AspNetCore.Mvc.RazorPages.PageContext pageContext, Microsoft.AspNetCore.Mvc.RazorPages.PageResult result) { throw null; } } public partial class PageViewLocationExpander : Microsoft.AspNetCore.Mvc.Razor.IViewLocationExpander diff --git a/src/Mvc/Mvc.RazorPages/test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj b/src/Mvc/Mvc.RazorPages/test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj index c4c209b50494..d717c09c3f32 100644 --- a/src/Mvc/Mvc.RazorPages/test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj +++ b/src/Mvc/Mvc.RazorPages/test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj @@ -10,7 +10,11 @@ + + + + diff --git a/src/Mvc/Mvc.TagHelpers/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj b/src/Mvc/Mvc.TagHelpers/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj index fe40762689bb..39858d982573 100644 --- a/src/Mvc/Mvc.TagHelpers/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj +++ b/src/Mvc/Mvc.TagHelpers/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj @@ -10,8 +10,11 @@ + + + diff --git a/src/Mvc/Mvc.ViewFeatures/ref/Directory.Build.props b/src/Mvc/Mvc.ViewFeatures/ref/Directory.Build.props index b500fb5d98e7..ea5de23302dc 100644 --- a/src/Mvc/Mvc.ViewFeatures/ref/Directory.Build.props +++ b/src/Mvc/Mvc.ViewFeatures/ref/Directory.Build.props @@ -2,7 +2,6 @@ - true $(NoWarn);CS0169 \ No newline at end of file diff --git a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs index 003d5bf8a81c..f5f2f9d98427 100644 --- a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs +++ b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs @@ -7,14 +7,6 @@ [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.RazorPages, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.TagHelpers, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] - -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.RazorPages.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.TagHelpers.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Views.TestCommon, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.ViewFeatures.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers diff --git a/src/Mvc/Mvc.ViewFeatures/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj b/src/Mvc/Mvc.ViewFeatures/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj index 20555a966d55..52f38da3c3e1 100644 --- a/src/Mvc/Mvc.ViewFeatures/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj +++ b/src/Mvc/Mvc.ViewFeatures/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj @@ -9,5 +9,6 @@ + diff --git a/src/Mvc/Mvc/test/Microsoft.AspNetCore.Mvc.Test.csproj b/src/Mvc/Mvc/test/Microsoft.AspNetCore.Mvc.Test.csproj index c1b0ad0c0578..23c1d6fc8953 100644 --- a/src/Mvc/Mvc/test/Microsoft.AspNetCore.Mvc.Test.csproj +++ b/src/Mvc/Mvc/test/Microsoft.AspNetCore.Mvc.Test.csproj @@ -11,7 +11,12 @@ + + + + + diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj index 2a032bf85600..764b98eeea70 100644 --- a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj +++ b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj @@ -9,6 +9,7 @@ + diff --git a/src/Mvc/shared/Mvc.Views.TestCommon/Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj b/src/Mvc/shared/Mvc.Views.TestCommon/Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj index 14d8694a65f7..76e74a3374e3 100644 --- a/src/Mvc/shared/Mvc.Views.TestCommon/Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj +++ b/src/Mvc/shared/Mvc.Views.TestCommon/Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj @@ -7,6 +7,8 @@ + + diff --git a/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj b/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj index 09fbc8c5dc89..b187f058e78a 100644 --- a/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj +++ b/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj @@ -28,6 +28,9 @@ + + + @@ -55,6 +58,9 @@ + + + diff --git a/src/Mvc/test/Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj b/src/Mvc/test/Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj index baf0fa44c00d..b4136eea559e 100644 --- a/src/Mvc/test/Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj +++ b/src/Mvc/test/Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj @@ -8,7 +8,9 @@ + + diff --git a/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj b/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj index a0055c58bc1c..701317f7456b 100644 --- a/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj +++ b/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj @@ -23,7 +23,11 @@ + + + + @@ -70,7 +74,7 @@ - + + + diff --git a/src/SignalR/clients/csharp/Client/test/UnitTests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj b/src/SignalR/clients/csharp/Client/test/UnitTests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj index 4f6ea2d63d0d..0371887acc62 100644 --- a/src/SignalR/clients/csharp/Client/test/UnitTests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj +++ b/src/SignalR/clients/csharp/Client/test/UnitTests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj @@ -18,6 +18,7 @@ + diff --git a/src/SignalR/common/Http.Connections/test/Microsoft.AspNetCore.Http.Connections.Tests.csproj b/src/SignalR/common/Http.Connections/test/Microsoft.AspNetCore.Http.Connections.Tests.csproj index 01f0769245e2..323633104c4e 100644 --- a/src/SignalR/common/Http.Connections/test/Microsoft.AspNetCore.Http.Connections.Tests.csproj +++ b/src/SignalR/common/Http.Connections/test/Microsoft.AspNetCore.Http.Connections.Tests.csproj @@ -17,8 +17,10 @@ + + diff --git a/src/SignalR/common/SignalR.Common/test/Microsoft.AspNetCore.SignalR.Common.Tests.csproj b/src/SignalR/common/SignalR.Common/test/Microsoft.AspNetCore.SignalR.Common.Tests.csproj index cfef1f1d74d0..8c3be81d97f5 100644 --- a/src/SignalR/common/SignalR.Common/test/Microsoft.AspNetCore.SignalR.Common.Tests.csproj +++ b/src/SignalR/common/SignalR.Common/test/Microsoft.AspNetCore.SignalR.Common.Tests.csproj @@ -15,6 +15,7 @@ + diff --git a/src/SignalR/perf/Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj b/src/SignalR/perf/Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj index c007a68669ab..8ddcda860d2f 100644 --- a/src/SignalR/perf/Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj +++ b/src/SignalR/perf/Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj @@ -23,6 +23,7 @@ + @@ -30,6 +31,7 @@ + diff --git a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests.csproj b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests.csproj index 741d9fb15534..c9dda26dbe8d 100644 --- a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests.csproj +++ b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests.csproj @@ -15,12 +15,15 @@ + + + diff --git a/src/SignalR/server/StackExchangeRedis/test/Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests.csproj b/src/SignalR/server/StackExchangeRedis/test/Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests.csproj index a2f5905d73ca..ea94e7071e77 100644 --- a/src/SignalR/server/StackExchangeRedis/test/Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests.csproj +++ b/src/SignalR/server/StackExchangeRedis/test/Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests.csproj @@ -9,10 +9,13 @@ + + + From ee46df500ea8aaf2ec0c41ba7c29c14d9947bea1 Mon Sep 17 00:00:00 2001 From: John Luo Date: Sat, 12 Oct 2019 23:57:05 -0700 Subject: [PATCH 037/116] Feedback --- .../src/Internal}/CryptographyAlgorithms.cs | 0 .../Microsoft.AspNetCore.Antiforgery.csproj | 2 -- .../Microsoft.AspNetCore.Mvc.Core.Manual.cs | 21 ---------------- .../src/Formatters/MediaTypeHeaderValues.cs | 3 --- .../src/MediaTypeHeaderValues.cs | 22 ++++++++++++++++ ...osoft.AspNetCore.Mvc.NewtonsoftJson.csproj | 1 + .../Microsoft.AspNetCore.Mvc.Razor.Manual.cs | 5 ++++ .../Infrastructure/CryptographyAlgorithms.cs | 25 +++++++++++++++++++ .../src/Microsoft.AspNetCore.Mvc.Razor.csproj | 2 -- .../Mvc.TagHelpers/src/Cache/CacheTagKey.cs | 1 - ...Microsoft.AspNetCore.Mvc.TagHelpers.csproj | 3 +-- .../test/Microsoft.AspNetCore.Mvc.Test.csproj | 1 + ...icrosoft.AspNetCore.Mvc.Performance.csproj | 1 + 13 files changed, 56 insertions(+), 31 deletions(-) rename src/{Shared/CryptographyAlgorithms => Antiforgery/src/Internal}/CryptographyAlgorithms.cs (100%) create mode 100644 src/Mvc/Mvc.NewtonsoftJson/src/MediaTypeHeaderValues.cs create mode 100644 src/Mvc/Mvc.Razor/src/Infrastructure/CryptographyAlgorithms.cs diff --git a/src/Shared/CryptographyAlgorithms/CryptographyAlgorithms.cs b/src/Antiforgery/src/Internal/CryptographyAlgorithms.cs similarity index 100% rename from src/Shared/CryptographyAlgorithms/CryptographyAlgorithms.cs rename to src/Antiforgery/src/Internal/CryptographyAlgorithms.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery.csproj b/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery.csproj index 276d0fd0dff9..5fb2ea705079 100644 --- a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery.csproj +++ b/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery.csproj @@ -10,8 +10,6 @@ - - diff --git a/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.Manual.cs b/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.Manual.cs index e117f8360b33..1e379512413b 100644 --- a/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.Manual.cs +++ b/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.Manual.cs @@ -12,32 +12,11 @@ [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.DataAnnotations, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Formatters.Xml, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Localization, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.NewtonsoftJson, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.RazorPages, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.TagHelpers, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Testing, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.ViewFeatures, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] - -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Abstractions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.ApiExplorer.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Core.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Core.TestCommon, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Cors.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.DataAnnotations.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Formatters.Xml.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.IntegrationTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Localization.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.RazorPages.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.TagHelpers.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.ViewFeatures.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Views.TestCommon, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] - -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Performance, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] - [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] namespace Microsoft.AspNetCore.Internal diff --git a/src/Mvc/Mvc.Core/src/Formatters/MediaTypeHeaderValues.cs b/src/Mvc/Mvc.Core/src/Formatters/MediaTypeHeaderValues.cs index 1548e7eca475..8d1eaae71708 100644 --- a/src/Mvc/Mvc.Core/src/Formatters/MediaTypeHeaderValues.cs +++ b/src/Mvc/Mvc.Core/src/Formatters/MediaTypeHeaderValues.cs @@ -16,9 +16,6 @@ public static readonly MediaTypeHeaderValue TextJson public static readonly MediaTypeHeaderValue ApplicationAnyJsonSyntax = MediaTypeHeaderValue.Parse("application/*+json").CopyAsReadOnly(); - public static readonly MediaTypeHeaderValue ApplicationJsonPatch - = MediaTypeHeaderValue.Parse("application/json-patch+json").CopyAsReadOnly(); - public static readonly MediaTypeHeaderValue ApplicationXml = MediaTypeHeaderValue.Parse("application/xml").CopyAsReadOnly(); diff --git a/src/Mvc/Mvc.NewtonsoftJson/src/MediaTypeHeaderValues.cs b/src/Mvc/Mvc.NewtonsoftJson/src/MediaTypeHeaderValues.cs new file mode 100644 index 000000000000..5795d08d3509 --- /dev/null +++ b/src/Mvc/Mvc.NewtonsoftJson/src/MediaTypeHeaderValues.cs @@ -0,0 +1,22 @@ +// 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 Microsoft.Net.Http.Headers; + +namespace Microsoft.AspNetCore.Mvc.NewtonsoftJson +{ + internal static class MediaTypeHeaderValues + { + public static readonly MediaTypeHeaderValue ApplicationJson + = MediaTypeHeaderValue.Parse("application/json").CopyAsReadOnly(); + + public static readonly MediaTypeHeaderValue TextJson + = MediaTypeHeaderValue.Parse("text/json").CopyAsReadOnly(); + + public static readonly MediaTypeHeaderValue ApplicationJsonPatch + = MediaTypeHeaderValue.Parse("application/json-patch+json").CopyAsReadOnly(); + + public static readonly MediaTypeHeaderValue ApplicationAnyJsonSyntax + = MediaTypeHeaderValue.Parse("application/*+json").CopyAsReadOnly(); + } +} diff --git a/src/Mvc/Mvc.NewtonsoftJson/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj b/src/Mvc/Mvc.NewtonsoftJson/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj index 53a5985ed13d..2c81323847d0 100644 --- a/src/Mvc/Mvc.NewtonsoftJson/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj +++ b/src/Mvc/Mvc.NewtonsoftJson/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj @@ -21,6 +21,7 @@ + diff --git a/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.Manual.cs b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.Manual.cs index 7af6b7388acb..453edf2999f9 100644 --- a/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.Manual.cs +++ b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.Manual.cs @@ -171,6 +171,11 @@ public partial class RazorViewEngine : Microsoft.AspNetCore.Mvc.Razor.IRazorView } namespace Microsoft.AspNetCore.Mvc.Razor.Infrastructure { + internal static partial class CryptographyAlgorithms + { + public static System.Security.Cryptography.SHA256 CreateSHA256() { throw null; } + } + internal partial class DefaultFileVersionProvider : Microsoft.AspNetCore.Mvc.ViewFeatures.IFileVersionProvider { private static readonly char[] QueryStringAndFragmentTokens; diff --git a/src/Mvc/Mvc.Razor/src/Infrastructure/CryptographyAlgorithms.cs b/src/Mvc/Mvc.Razor/src/Infrastructure/CryptographyAlgorithms.cs new file mode 100644 index 000000000000..c06a3b2d7e35 --- /dev/null +++ b/src/Mvc/Mvc.Razor/src/Infrastructure/CryptographyAlgorithms.cs @@ -0,0 +1,25 @@ +// 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.Security.Cryptography; + +namespace Microsoft.AspNetCore.Mvc.Razor.Infrastructure +{ + internal static class CryptographyAlgorithms + { + public static SHA256 CreateSHA256() + { + try + { + return SHA256.Create(); + } + // SHA256.Create is documented to throw this exception on FIPS compliant machines. + // See: https://msdn.microsoft.com/en-us/library/z08hz7ad%28v=vs.110%29.aspx?f=255&MSPPError=-2147217396 + catch (System.Reflection.TargetInvocationException) + { + // Fallback to a FIPS compliant SHA256 algorithm. + return new SHA256CryptoServiceProvider(); + } + } + } +} \ No newline at end of file diff --git a/src/Mvc/Mvc.Razor/src/Microsoft.AspNetCore.Mvc.Razor.csproj b/src/Mvc/Mvc.Razor/src/Microsoft.AspNetCore.Mvc.Razor.csproj index 8d1678ec2c82..0ef53a3026ed 100644 --- a/src/Mvc/Mvc.Razor/src/Microsoft.AspNetCore.Mvc.Razor.csproj +++ b/src/Mvc/Mvc.Razor/src/Microsoft.AspNetCore.Mvc.Razor.csproj @@ -11,8 +11,6 @@ - - diff --git a/src/Mvc/Mvc.TagHelpers/src/Cache/CacheTagKey.cs b/src/Mvc/Mvc.TagHelpers/src/Cache/CacheTagKey.cs index b90da105d2a3..bf327f30caf1 100644 --- a/src/Mvc/Mvc.TagHelpers/src/Cache/CacheTagKey.cs +++ b/src/Mvc/Mvc.TagHelpers/src/Cache/CacheTagKey.cs @@ -5,7 +5,6 @@ using System.Collections.Generic; using System.Globalization; using System.Text; -using Microsoft.AspNetCore.Antiforgery; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Razor.Infrastructure; using Microsoft.AspNetCore.Razor.TagHelpers; diff --git a/src/Mvc/Mvc.TagHelpers/src/Microsoft.AspNetCore.Mvc.TagHelpers.csproj b/src/Mvc/Mvc.TagHelpers/src/Microsoft.AspNetCore.Mvc.TagHelpers.csproj index b7ffd1af08ca..f35047659898 100644 --- a/src/Mvc/Mvc.TagHelpers/src/Microsoft.AspNetCore.Mvc.TagHelpers.csproj +++ b/src/Mvc/Mvc.TagHelpers/src/Microsoft.AspNetCore.Mvc.TagHelpers.csproj @@ -14,9 +14,8 @@ - - + diff --git a/src/Mvc/Mvc/test/Microsoft.AspNetCore.Mvc.Test.csproj b/src/Mvc/Mvc/test/Microsoft.AspNetCore.Mvc.Test.csproj index 23c1d6fc8953..b327f52a027d 100644 --- a/src/Mvc/Mvc/test/Microsoft.AspNetCore.Mvc.Test.csproj +++ b/src/Mvc/Mvc/test/Microsoft.AspNetCore.Mvc.Test.csproj @@ -11,6 +11,7 @@ + diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj index 764b98eeea70..3ef36fe71484 100644 --- a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj +++ b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj @@ -9,6 +9,7 @@ + From dbf74f2671de22f82763a32e6bcc55c68bac7b4c Mon Sep 17 00:00:00 2001 From: John Luo Date: Sun, 13 Oct 2019 20:35:33 -0700 Subject: [PATCH 038/116] Fix crossgen --- .../src/Microsoft.AspNetCore.App.Runtime.csproj | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj index 9b6fe29f6f16..d22776996579 100644 --- a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -21,6 +21,10 @@ This package is an internal implementation of the .NET Core SDK and is not meant true DotnetPlatform + + false + true + aspnetcore_base_runtime.version $(InstallersOutputPath)$(BaseRuntimeVersionFileName) @@ -293,11 +297,13 @@ This package is an internal implementation of the .NET Core SDK and is not meant --> $(IntermediateOutputPath)crossgen\ + $(IntermediateOutputPath)platformAssemblies\ $(CrossgenToolDir)$(LibPrefix)clrjit$(LibExtension) + @@ -306,13 +312,19 @@ This package is an internal implementation of the .NET Core SDK and is not meant + + + <_PlatformAssemblyPaths Include="$(CrossgenToolDir)" /> - <_PlatformAssemblyPaths Include="@(ReferenceCopyLocalPaths->'%(RootDir)%(Directory)')" /> + + <_PlatformAssemblyPaths Include="@(ReferenceCopyLocalPaths->'%(RootDir)%(Directory)')" Condition="'%(ReferenceCopyLocalPaths.ProjectPath)' == ''"/> + + <_PlatformAssemblyPaths Include="$(CrossgenPlatformAssembliesDir)"/> From f03bf6573c94666a1a93ee1d023603a1d90d94f8 Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 14 Oct 2019 00:41:35 -0700 Subject: [PATCH 039/116] Fix tools --- .../src/Microsoft.Extensions.ApiDescription.Server.csproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj index c4c5f3aa7ff8..ec17e4ad6ad3 100644 --- a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj +++ b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj @@ -13,6 +13,9 @@ MSBuild;Swagger;OpenAPI;code generation;Web API;service reference;document generation true true + + true + false - @(_ResultTargetFramework) + @(_ResultTargetFramework)$(_ExcludeFromSourceBuild) @(ProjectListContentItem->'%(Identity)', '%0A') diff --git a/src/Antiforgery/ref/Microsoft.AspNetCore.Antiforgery.csproj b/src/Antiforgery/ref/Microsoft.AspNetCore.Antiforgery.csproj index 5f34ef3e76e8..2a99290b34eb 100644 --- a/src/Antiforgery/ref/Microsoft.AspNetCore.Antiforgery.csproj +++ b/src/Antiforgery/ref/Microsoft.AspNetCore.Antiforgery.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.csproj b/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.csproj index d60eb3159494..8776ab9fef14 100644 --- a/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.csproj +++ b/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp3.0 + false + diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj b/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj index 3f0b80424f8c..943bf6782739 100644 --- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj +++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp3.0 + false + diff --git a/src/Components/Forms/ref/Microsoft.AspNetCore.Components.Forms.csproj b/src/Components/Forms/ref/Microsoft.AspNetCore.Components.Forms.csproj index 8e24904b634a..b3fe863ead5d 100644 --- a/src/Components/Forms/ref/Microsoft.AspNetCore.Components.Forms.csproj +++ b/src/Components/Forms/ref/Microsoft.AspNetCore.Components.Forms.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp3.0 + false + diff --git a/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.csproj b/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.csproj index 21f0c740e53c..3cdf8cc2becc 100644 --- a/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.csproj +++ b/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj b/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj index 74a0b82c27d0..6415de5e4fd3 100644 --- a/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj +++ b/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp3.0 + false + diff --git a/src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.csproj b/src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.csproj index 62dd2d978a90..4e04929cd187 100644 --- a/src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.csproj +++ b/src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.csproj @@ -2,6 +2,8 @@ netstandard2.0 + false + diff --git a/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj b/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj index 0374fb7c6d1e..62133dcbe870 100644 --- a/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj +++ b/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj @@ -2,6 +2,8 @@ netstandard2.0 + false + diff --git a/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj b/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj index 0dd3dbf34c1c..ad9a99c46321 100644 --- a/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj +++ b/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp2.0 + false + diff --git a/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj b/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj index 2a41fa1e7577..9f8c21ba0fc3 100644 --- a/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj +++ b/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp3.0 + false + diff --git a/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj b/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj index 32b774090fc7..d2d166c02dd7 100644 --- a/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj +++ b/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp3.0 + false + diff --git a/src/DefaultBuilder/ref/Microsoft.AspNetCore.csproj b/src/DefaultBuilder/ref/Microsoft.AspNetCore.csproj index dd42476a0126..b232f9b6b3f9 100644 --- a/src/DefaultBuilder/ref/Microsoft.AspNetCore.csproj +++ b/src/DefaultBuilder/ref/Microsoft.AspNetCore.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Hosting/Abstractions/ref/Microsoft.AspNetCore.Hosting.Abstractions.csproj b/src/Hosting/Abstractions/ref/Microsoft.AspNetCore.Hosting.Abstractions.csproj index 494c7d61aea9..6b19abf98b3c 100644 --- a/src/Hosting/Abstractions/ref/Microsoft.AspNetCore.Hosting.Abstractions.csproj +++ b/src/Hosting/Abstractions/ref/Microsoft.AspNetCore.Hosting.Abstractions.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.csproj b/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.csproj index 40455060c2a7..b05a67027c63 100644 --- a/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.csproj +++ b/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Hosting/Server.Abstractions/ref/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj b/src/Hosting/Server.Abstractions/ref/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj index b9c84f7e3318..74101ce3e9ad 100644 --- a/src/Hosting/Server.Abstractions/ref/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj +++ b/src/Hosting/Server.Abstractions/ref/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Html/Abstractions/ref/Microsoft.AspNetCore.Html.Abstractions.csproj b/src/Html/Abstractions/ref/Microsoft.AspNetCore.Html.Abstractions.csproj index e78b0215243f..20451ebbd5d1 100644 --- a/src/Html/Abstractions/ref/Microsoft.AspNetCore.Html.Abstractions.csproj +++ b/src/Html/Abstractions/ref/Microsoft.AspNetCore.Html.Abstractions.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Http/Authentication.Abstractions/ref/Microsoft.AspNetCore.Authentication.Abstractions.csproj b/src/Http/Authentication.Abstractions/ref/Microsoft.AspNetCore.Authentication.Abstractions.csproj index 192cf512702b..8f174166c194 100644 --- a/src/Http/Authentication.Abstractions/ref/Microsoft.AspNetCore.Authentication.Abstractions.csproj +++ b/src/Http/Authentication.Abstractions/ref/Microsoft.AspNetCore.Authentication.Abstractions.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Http/Authentication.Core/ref/Microsoft.AspNetCore.Authentication.Core.csproj b/src/Http/Authentication.Core/ref/Microsoft.AspNetCore.Authentication.Core.csproj index 9f4bc43e08c9..4be3f7558218 100644 --- a/src/Http/Authentication.Core/ref/Microsoft.AspNetCore.Authentication.Core.csproj +++ b/src/Http/Authentication.Core/ref/Microsoft.AspNetCore.Authentication.Core.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Http/Headers/ref/Microsoft.Net.Http.Headers.csproj b/src/Http/Headers/ref/Microsoft.Net.Http.Headers.csproj index 4ac03925e975..167dfca0e1f2 100644 --- a/src/Http/Headers/ref/Microsoft.Net.Http.Headers.csproj +++ b/src/Http/Headers/ref/Microsoft.Net.Http.Headers.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.csproj b/src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.csproj index fe49c287c453..2d9a7fc6c201 100644 --- a/src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.csproj +++ b/src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Http/Http.Extensions/ref/Microsoft.AspNetCore.Http.Extensions.csproj b/src/Http/Http.Extensions/ref/Microsoft.AspNetCore.Http.Extensions.csproj index bba8cc701ed3..cb0f17657723 100644 --- a/src/Http/Http.Extensions/ref/Microsoft.AspNetCore.Http.Extensions.csproj +++ b/src/Http/Http.Extensions/ref/Microsoft.AspNetCore.Http.Extensions.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj b/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj index 1e342f6be0f8..410b369e199a 100644 --- a/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj +++ b/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp3.0 + false + diff --git a/src/Http/Http/ref/Microsoft.AspNetCore.Http.csproj b/src/Http/Http/ref/Microsoft.AspNetCore.Http.csproj index f59274ed7f7f..ee10cacf378e 100644 --- a/src/Http/Http/ref/Microsoft.AspNetCore.Http.csproj +++ b/src/Http/Http/ref/Microsoft.AspNetCore.Http.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Http/Metadata/ref/Microsoft.AspNetCore.Metadata.csproj b/src/Http/Metadata/ref/Microsoft.AspNetCore.Metadata.csproj index 5bd3e643f1ed..4507a5bf6963 100644 --- a/src/Http/Metadata/ref/Microsoft.AspNetCore.Metadata.csproj +++ b/src/Http/Metadata/ref/Microsoft.AspNetCore.Metadata.csproj @@ -2,6 +2,8 @@ netstandard2.0 + false + diff --git a/src/Http/Routing.Abstractions/ref/Microsoft.AspNetCore.Routing.Abstractions.csproj b/src/Http/Routing.Abstractions/ref/Microsoft.AspNetCore.Routing.Abstractions.csproj index fe6fa231aa74..5d03f3ad8b33 100644 --- a/src/Http/Routing.Abstractions/ref/Microsoft.AspNetCore.Routing.Abstractions.csproj +++ b/src/Http/Routing.Abstractions/ref/Microsoft.AspNetCore.Routing.Abstractions.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.csproj b/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.csproj index a68d86a042b3..a2214046b7c7 100644 --- a/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.csproj +++ b/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Http/WebUtilities/ref/Microsoft.AspNetCore.WebUtilities.csproj b/src/Http/WebUtilities/ref/Microsoft.AspNetCore.WebUtilities.csproj index e48d4616afc1..b0338e92a7b6 100644 --- a/src/Http/WebUtilities/ref/Microsoft.AspNetCore.WebUtilities.csproj +++ b/src/Http/WebUtilities/ref/Microsoft.AspNetCore.WebUtilities.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Identity/Core/ref/Microsoft.AspNetCore.Identity.csproj b/src/Identity/Core/ref/Microsoft.AspNetCore.Identity.csproj index 29f919fbe6ba..f67a4d2fcfd4 100644 --- a/src/Identity/Core/ref/Microsoft.AspNetCore.Identity.csproj +++ b/src/Identity/Core/ref/Microsoft.AspNetCore.Identity.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj b/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj index 50615ee4e140..1d3566072206 100644 --- a/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj +++ b/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp3.0 + false + diff --git a/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj b/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj index 7a0f728cb474..c101e8c68de9 100644 --- a/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj +++ b/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp3.0 + false + diff --git a/src/Middleware/CORS/ref/Microsoft.AspNetCore.Cors.csproj b/src/Middleware/CORS/ref/Microsoft.AspNetCore.Cors.csproj index 7f2aea45709d..9a9c7c1a778b 100644 --- a/src/Middleware/CORS/ref/Microsoft.AspNetCore.Cors.csproj +++ b/src/Middleware/CORS/ref/Microsoft.AspNetCore.Cors.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/Diagnostics.Abstractions/ref/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj b/src/Middleware/Diagnostics.Abstractions/ref/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj index eeb85ae2392b..474f1b32beec 100644 --- a/src/Middleware/Diagnostics.Abstractions/ref/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj +++ b/src/Middleware/Diagnostics.Abstractions/ref/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/Diagnostics/ref/Microsoft.AspNetCore.Diagnostics.csproj b/src/Middleware/Diagnostics/ref/Microsoft.AspNetCore.Diagnostics.csproj index a33f66dfdc24..8e7f04791be2 100644 --- a/src/Middleware/Diagnostics/ref/Microsoft.AspNetCore.Diagnostics.csproj +++ b/src/Middleware/Diagnostics/ref/Microsoft.AspNetCore.Diagnostics.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/HealthChecks/ref/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj b/src/Middleware/HealthChecks/ref/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj index fc3578697815..a47255bc03de 100644 --- a/src/Middleware/HealthChecks/ref/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj +++ b/src/Middleware/HealthChecks/ref/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/HostFiltering/ref/Microsoft.AspNetCore.HostFiltering.csproj b/src/Middleware/HostFiltering/ref/Microsoft.AspNetCore.HostFiltering.csproj index 0c879a2ba6fb..96216afaf557 100644 --- a/src/Middleware/HostFiltering/ref/Microsoft.AspNetCore.HostFiltering.csproj +++ b/src/Middleware/HostFiltering/ref/Microsoft.AspNetCore.HostFiltering.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/HttpOverrides/ref/Microsoft.AspNetCore.HttpOverrides.csproj b/src/Middleware/HttpOverrides/ref/Microsoft.AspNetCore.HttpOverrides.csproj index c2cc3193452b..59fcb83baa48 100644 --- a/src/Middleware/HttpOverrides/ref/Microsoft.AspNetCore.HttpOverrides.csproj +++ b/src/Middleware/HttpOverrides/ref/Microsoft.AspNetCore.HttpOverrides.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/HttpsPolicy/ref/Microsoft.AspNetCore.HttpsPolicy.csproj b/src/Middleware/HttpsPolicy/ref/Microsoft.AspNetCore.HttpsPolicy.csproj index 05f6a4263778..8a24b069bf71 100644 --- a/src/Middleware/HttpsPolicy/ref/Microsoft.AspNetCore.HttpsPolicy.csproj +++ b/src/Middleware/HttpsPolicy/ref/Microsoft.AspNetCore.HttpsPolicy.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/Localization.Routing/ref/Microsoft.AspNetCore.Localization.Routing.csproj b/src/Middleware/Localization.Routing/ref/Microsoft.AspNetCore.Localization.Routing.csproj index 050ea0a4afc8..3dccb4a64b1e 100644 --- a/src/Middleware/Localization.Routing/ref/Microsoft.AspNetCore.Localization.Routing.csproj +++ b/src/Middleware/Localization.Routing/ref/Microsoft.AspNetCore.Localization.Routing.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/Localization/ref/Microsoft.AspNetCore.Localization.csproj b/src/Middleware/Localization/ref/Microsoft.AspNetCore.Localization.csproj index 9ae583c9ec0a..5ec5751618b6 100644 --- a/src/Middleware/Localization/ref/Microsoft.AspNetCore.Localization.csproj +++ b/src/Middleware/Localization/ref/Microsoft.AspNetCore.Localization.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/ResponseCaching.Abstractions/ref/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj b/src/Middleware/ResponseCaching.Abstractions/ref/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj index fe10c4e2a8b9..dbc557d00505 100644 --- a/src/Middleware/ResponseCaching.Abstractions/ref/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj +++ b/src/Middleware/ResponseCaching.Abstractions/ref/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/ResponseCaching/ref/Microsoft.AspNetCore.ResponseCaching.csproj b/src/Middleware/ResponseCaching/ref/Microsoft.AspNetCore.ResponseCaching.csproj index 985bcdbbc9b7..8fa81e3f4ac7 100644 --- a/src/Middleware/ResponseCaching/ref/Microsoft.AspNetCore.ResponseCaching.csproj +++ b/src/Middleware/ResponseCaching/ref/Microsoft.AspNetCore.ResponseCaching.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/ResponseCompression/ref/Microsoft.AspNetCore.ResponseCompression.csproj b/src/Middleware/ResponseCompression/ref/Microsoft.AspNetCore.ResponseCompression.csproj index 4cf1f5fef450..8f6c10f1e817 100644 --- a/src/Middleware/ResponseCompression/ref/Microsoft.AspNetCore.ResponseCompression.csproj +++ b/src/Middleware/ResponseCompression/ref/Microsoft.AspNetCore.ResponseCompression.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/Rewrite/ref/Microsoft.AspNetCore.Rewrite.csproj b/src/Middleware/Rewrite/ref/Microsoft.AspNetCore.Rewrite.csproj index a4014b3f9491..6d6b32b2d98a 100644 --- a/src/Middleware/Rewrite/ref/Microsoft.AspNetCore.Rewrite.csproj +++ b/src/Middleware/Rewrite/ref/Microsoft.AspNetCore.Rewrite.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/Session/ref/Microsoft.AspNetCore.Session.csproj b/src/Middleware/Session/ref/Microsoft.AspNetCore.Session.csproj index 3c0a92ba63d5..ce87d521d4b0 100644 --- a/src/Middleware/Session/ref/Microsoft.AspNetCore.Session.csproj +++ b/src/Middleware/Session/ref/Microsoft.AspNetCore.Session.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/StaticFiles/ref/Microsoft.AspNetCore.StaticFiles.csproj b/src/Middleware/StaticFiles/ref/Microsoft.AspNetCore.StaticFiles.csproj index 0bd2351f3816..d59c4f309cf6 100644 --- a/src/Middleware/StaticFiles/ref/Microsoft.AspNetCore.StaticFiles.csproj +++ b/src/Middleware/StaticFiles/ref/Microsoft.AspNetCore.StaticFiles.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/WebSockets/ref/Microsoft.AspNetCore.WebSockets.csproj b/src/Middleware/WebSockets/ref/Microsoft.AspNetCore.WebSockets.csproj index e5ae8749c656..d5319c29c18e 100644 --- a/src/Middleware/WebSockets/ref/Microsoft.AspNetCore.WebSockets.csproj +++ b/src/Middleware/WebSockets/ref/Microsoft.AspNetCore.WebSockets.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Mvc/Mvc.Abstractions/ref/Microsoft.AspNetCore.Mvc.Abstractions.csproj b/src/Mvc/Mvc.Abstractions/ref/Microsoft.AspNetCore.Mvc.Abstractions.csproj index 90b63669a8da..9e352d857fd7 100644 --- a/src/Mvc/Mvc.Abstractions/ref/Microsoft.AspNetCore.Mvc.Abstractions.csproj +++ b/src/Mvc/Mvc.Abstractions/ref/Microsoft.AspNetCore.Mvc.Abstractions.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Mvc/Mvc.ApiExplorer/ref/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj b/src/Mvc/Mvc.ApiExplorer/ref/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj index 10680b3401d4..5e6529a67fa0 100644 --- a/src/Mvc/Mvc.ApiExplorer/ref/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj +++ b/src/Mvc/Mvc.ApiExplorer/ref/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.csproj b/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.csproj index c14660a23715..e468693de9c9 100644 --- a/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.csproj +++ b/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.csproj b/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.csproj index a3bf5f99a621..315dc16d7c43 100644 --- a/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.csproj +++ b/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj b/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj index 1d4f09f1b2c9..396d4391a3a2 100644 --- a/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj +++ b/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Mvc/Mvc.Formatters.Json/ref/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj b/src/Mvc/Mvc.Formatters.Json/ref/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj index 520d3abb2032..b020972f0a88 100644 --- a/src/Mvc/Mvc.Formatters.Json/ref/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj +++ b/src/Mvc/Mvc.Formatters.Json/ref/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Mvc/Mvc.Formatters.Xml/ref/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj b/src/Mvc/Mvc.Formatters.Xml/ref/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj index c83f79c76fc8..401f13b62f43 100644 --- a/src/Mvc/Mvc.Formatters.Xml/ref/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj +++ b/src/Mvc/Mvc.Formatters.Xml/ref/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Mvc/Mvc.Localization/ref/Microsoft.AspNetCore.Mvc.Localization.csproj b/src/Mvc/Mvc.Localization/ref/Microsoft.AspNetCore.Mvc.Localization.csproj index 1021609ed355..19eedd135a51 100644 --- a/src/Mvc/Mvc.Localization/ref/Microsoft.AspNetCore.Mvc.Localization.csproj +++ b/src/Mvc/Mvc.Localization/ref/Microsoft.AspNetCore.Mvc.Localization.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.csproj b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.csproj index 84a430d43b7f..3141b53f1ad8 100644 --- a/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.csproj +++ b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.csproj b/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.csproj index 8928351fd2a1..c21c532d01bf 100644 --- a/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.csproj +++ b/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Mvc/Mvc.TagHelpers/ref/Microsoft.AspNetCore.Mvc.TagHelpers.csproj b/src/Mvc/Mvc.TagHelpers/ref/Microsoft.AspNetCore.Mvc.TagHelpers.csproj index 2c0acec9fc35..54c737be53e8 100644 --- a/src/Mvc/Mvc.TagHelpers/ref/Microsoft.AspNetCore.Mvc.TagHelpers.csproj +++ b/src/Mvc/Mvc.TagHelpers/ref/Microsoft.AspNetCore.Mvc.TagHelpers.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj index 5d21f0ed988b..3746041b8bf5 100644 --- a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj +++ b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Mvc/Mvc/ref/Microsoft.AspNetCore.Mvc.csproj b/src/Mvc/Mvc/ref/Microsoft.AspNetCore.Mvc.csproj index 0bd19fa8afbf..1d94cff584ad 100644 --- a/src/Mvc/Mvc/ref/Microsoft.AspNetCore.Mvc.csproj +++ b/src/Mvc/Mvc/ref/Microsoft.AspNetCore.Mvc.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Razor/Razor.Runtime/ref/Microsoft.AspNetCore.Razor.Runtime.csproj b/src/Razor/Razor.Runtime/ref/Microsoft.AspNetCore.Razor.Runtime.csproj index 8f18b188793c..b93f53387b92 100644 --- a/src/Razor/Razor.Runtime/ref/Microsoft.AspNetCore.Razor.Runtime.csproj +++ b/src/Razor/Razor.Runtime/ref/Microsoft.AspNetCore.Razor.Runtime.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Razor/Razor/ref/Microsoft.AspNetCore.Razor.csproj b/src/Razor/Razor/ref/Microsoft.AspNetCore.Razor.csproj index c4c063edb8e5..2138edbbf987 100644 --- a/src/Razor/Razor/ref/Microsoft.AspNetCore.Razor.csproj +++ b/src/Razor/Razor/ref/Microsoft.AspNetCore.Razor.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Security/Authentication/Cookies/ref/Microsoft.AspNetCore.Authentication.Cookies.csproj b/src/Security/Authentication/Cookies/ref/Microsoft.AspNetCore.Authentication.Cookies.csproj index c6b74638d115..30f48fd46662 100644 --- a/src/Security/Authentication/Cookies/ref/Microsoft.AspNetCore.Authentication.Cookies.csproj +++ b/src/Security/Authentication/Cookies/ref/Microsoft.AspNetCore.Authentication.Cookies.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Security/Authentication/Core/ref/Microsoft.AspNetCore.Authentication.csproj b/src/Security/Authentication/Core/ref/Microsoft.AspNetCore.Authentication.csproj index 0f53ab690a84..d210d921c56e 100644 --- a/src/Security/Authentication/Core/ref/Microsoft.AspNetCore.Authentication.csproj +++ b/src/Security/Authentication/Core/ref/Microsoft.AspNetCore.Authentication.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Security/Authentication/OAuth/ref/Microsoft.AspNetCore.Authentication.OAuth.csproj b/src/Security/Authentication/OAuth/ref/Microsoft.AspNetCore.Authentication.OAuth.csproj index 748ac04e8a30..1806276892a5 100644 --- a/src/Security/Authentication/OAuth/ref/Microsoft.AspNetCore.Authentication.OAuth.csproj +++ b/src/Security/Authentication/OAuth/ref/Microsoft.AspNetCore.Authentication.OAuth.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj b/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj index 6b81f7e2ca12..88480c4611aa 100644 --- a/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj +++ b/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp3.0 + false + diff --git a/src/Security/Authorization/Policy/ref/Microsoft.AspNetCore.Authorization.Policy.csproj b/src/Security/Authorization/Policy/ref/Microsoft.AspNetCore.Authorization.Policy.csproj index 2abea2d03863..9cde58e8488a 100644 --- a/src/Security/Authorization/Policy/ref/Microsoft.AspNetCore.Authorization.Policy.csproj +++ b/src/Security/Authorization/Policy/ref/Microsoft.AspNetCore.Authorization.Policy.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Security/CookiePolicy/ref/Microsoft.AspNetCore.CookiePolicy.csproj b/src/Security/CookiePolicy/ref/Microsoft.AspNetCore.CookiePolicy.csproj index be94f37e478c..7f243e54d676 100644 --- a/src/Security/CookiePolicy/ref/Microsoft.AspNetCore.CookiePolicy.csproj +++ b/src/Security/CookiePolicy/ref/Microsoft.AspNetCore.CookiePolicy.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj b/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj index a3f3f4854660..c97c8dfe9b25 100644 --- a/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj +++ b/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj @@ -2,6 +2,8 @@ netstandard2.0;netstandard2.1;netcoreapp3.0 + false + diff --git a/src/Servers/HttpSys/ref/Microsoft.AspNetCore.Server.HttpSys.csproj b/src/Servers/HttpSys/ref/Microsoft.AspNetCore.Server.HttpSys.csproj index 5735d7254d36..2b92e312fd8a 100644 --- a/src/Servers/HttpSys/ref/Microsoft.AspNetCore.Server.HttpSys.csproj +++ b/src/Servers/HttpSys/ref/Microsoft.AspNetCore.Server.HttpSys.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Servers/IIS/IIS/ref/Microsoft.AspNetCore.Server.IIS.csproj b/src/Servers/IIS/IIS/ref/Microsoft.AspNetCore.Server.IIS.csproj index 371f23089cfc..95c9adfce871 100644 --- a/src/Servers/IIS/IIS/ref/Microsoft.AspNetCore.Server.IIS.csproj +++ b/src/Servers/IIS/IIS/ref/Microsoft.AspNetCore.Server.IIS.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Servers/IIS/IISIntegration/ref/Microsoft.AspNetCore.Server.IISIntegration.csproj b/src/Servers/IIS/IISIntegration/ref/Microsoft.AspNetCore.Server.IISIntegration.csproj index e5054cf68847..7574056789f5 100644 --- a/src/Servers/IIS/IISIntegration/ref/Microsoft.AspNetCore.Server.IISIntegration.csproj +++ b/src/Servers/IIS/IISIntegration/ref/Microsoft.AspNetCore.Server.IISIntegration.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj index 84e25fa0d16f..760057395edd 100644 --- a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj +++ b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Servers/Kestrel/Kestrel/ref/Microsoft.AspNetCore.Server.Kestrel.csproj b/src/Servers/Kestrel/Kestrel/ref/Microsoft.AspNetCore.Server.Kestrel.csproj index 4773f252522b..821e25a7e91c 100644 --- a/src/Servers/Kestrel/Kestrel/ref/Microsoft.AspNetCore.Server.Kestrel.csproj +++ b/src/Servers/Kestrel/Kestrel/ref/Microsoft.AspNetCore.Server.Kestrel.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj b/src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj index d5f1350fec57..3b493ee96fcd 100644 --- a/src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj +++ b/src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj b/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj index e7de246e9359..12cd68e60bb9 100644 --- a/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj +++ b/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp3.0 + false + diff --git a/src/SignalR/common/Http.Connections/ref/Microsoft.AspNetCore.Http.Connections.csproj b/src/SignalR/common/Http.Connections/ref/Microsoft.AspNetCore.Http.Connections.csproj index d22a24c9d7ff..09619247c72d 100644 --- a/src/SignalR/common/Http.Connections/ref/Microsoft.AspNetCore.Http.Connections.csproj +++ b/src/SignalR/common/Http.Connections/ref/Microsoft.AspNetCore.Http.Connections.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj b/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj index 7e0ddcd3dad8..9b5134468f66 100644 --- a/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj +++ b/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp3.0 + false + diff --git a/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj b/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj index e1fb26d63eb1..95fdf6b70ea6 100644 --- a/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj +++ b/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp3.0 + false + diff --git a/src/SignalR/server/Core/ref/Microsoft.AspNetCore.SignalR.Core.csproj b/src/SignalR/server/Core/ref/Microsoft.AspNetCore.SignalR.Core.csproj index 1681bddc3070..f5ec5324f3e0 100644 --- a/src/SignalR/server/Core/ref/Microsoft.AspNetCore.SignalR.Core.csproj +++ b/src/SignalR/server/Core/ref/Microsoft.AspNetCore.SignalR.Core.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/SignalR/server/SignalR/ref/Microsoft.AspNetCore.SignalR.csproj b/src/SignalR/server/SignalR/ref/Microsoft.AspNetCore.SignalR.csproj index 9f65eda5356b..82457dcd4512 100644 --- a/src/SignalR/server/SignalR/ref/Microsoft.AspNetCore.SignalR.csproj +++ b/src/SignalR/server/SignalR/ref/Microsoft.AspNetCore.SignalR.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + From 4b3d556288935ce3c06b34100178a5d4cbd99781 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 14 Oct 2019 11:26:08 -0700 Subject: [PATCH 041/116] Build targeting pack for 3.0.1 --- Directory.Build.props | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Directory.Build.props b/Directory.Build.props index 440c9d79a85b..731aabb16ca7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -93,6 +93,9 @@ false + + true + false - - true + + true - @(TargetingPackVersionInfo.PackageVersion) + @(_TargetingPackVersionInfo.PackageVersion) $(AspNetCoreBaselineVersion) From b589e58bf04000af49695609d46e4158afb3f698 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 15 Oct 2019 02:16:04 -0700 Subject: [PATCH 044/116] Try fixing siteex build --- .../Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj index 240809107d78..b0ecbfc69b12 100644 --- a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj +++ b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj @@ -16,6 +16,8 @@ true true true + false + true $(RestoreAdditionalProjectSources);$(ArtifactsNonShippingPackagesDir) From 0734b76f93fc03d1099c909505e6ccd6e0d1fdd3 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 15 Oct 2019 10:12:48 -0700 Subject: [PATCH 045/116] Fix Item->Property conversion in GenerateTestProps.targets --- .../test/Infrastructure/GenerateTestProps.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets index e387a80744f7..51e7e7f8837b 100644 --- a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets +++ b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets @@ -14,7 +14,7 @@ - @(_TargetingPackVersionInfo.PackageVersion) + @(_TargetingPackVersionInfo->'%(PackageVersion)' $(AspNetCoreBaselineVersion) From 6f72c901fe2f8b02570ae61c670766203fe8a8bb Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 15 Oct 2019 11:26:11 -0700 Subject: [PATCH 046/116] Another attempt at fixing template tests --- .../test/Infrastructure/GenerateTestProps.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets index 51e7e7f8837b..cd4a6bba23d4 100644 --- a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets +++ b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets @@ -14,7 +14,7 @@ - @(_TargetingPackVersionInfo->'%(PackageVersion)' + @(_TargetingPackVersionInfo->'%(_TargetingPackVersionInfo.PackageVersion)' $(AspNetCoreBaselineVersion) From 06ff350347e950b81f9f7f92aa043db0715697cf Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 15 Oct 2019 12:15:26 -0700 Subject: [PATCH 047/116] Another attempt at fixing template tests --- .../test/Infrastructure/GenerateTestProps.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets index cd4a6bba23d4..6e78a1593e94 100644 --- a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets +++ b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets @@ -14,7 +14,7 @@ - @(_TargetingPackVersionInfo->'%(_TargetingPackVersionInfo.PackageVersion)' + %(_TargetingPackVersionInfo.PackageVersion) $(AspNetCoreBaselineVersion) From 1d80e3d630dc74e1cc92e3e267ed204033dd5f2a Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 15 Oct 2019 02:16:42 -0700 Subject: [PATCH 048/116] Resolve reference assemblies from Extensions --- eng/targets/ResolveReferences.targets | 70 +++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index a23637fed734..46861966c73e 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -157,6 +157,76 @@ + + + + + + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.Abstractions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.Memory" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.SqlServer" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.StackExchangeRedis" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.Abstractions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.AzureKeyVault" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.Binder" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.CommandLine" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.EnvironmentVariables" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.FileExtensions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.Ini" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.Json" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.KeyPerFile" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.NewtonsoftJson" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.UserSecrets" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.DependencyInjection.Abstractions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.DependencyInjection" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.DiagnosticAdapter" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Diagnostics.HealthChecks" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileProviders.Abstractions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileProviders.Composite" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileProviders.Embedded" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileProviders.Physical" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileSystemGlobbing" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Hosting.Abstractions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Hosting" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Hosting.Systemd" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Hosting.WindowsServices" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Http" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Http.Polly" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Localization.Abstractions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Localization" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.Abstractions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.AzureAppServices" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.Configuration" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.Console" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.Debug" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.EventLog" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.EventSource" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.TraceSource" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.ObjectPool" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Options.ConfigurationExtensions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Options.DataAnnotations" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Options" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Primitives" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.WebEncoders" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.JSInterop" /> + <_ExtensionInternalRefAssemblies Include="Mono.WebAssembly.Interop" /> + + + <_NonExtensionPackageReferences Include="@(_LatestPackageReferenceWithVersion)" Exclude="@(_ExtensionInternalRefAssemblies)" /> + <_ExtensionPackageReferences Include="@(_LatestPackageReferenceWithVersion)" Exclude="@(_NonExtensionPackageReferences)" /> + + + <_LatestPackageReferenceWithVersion Remove="@(_ExtensionPackageReferences)" /> + + + + + + + From 41c00e45c09bc52a6e8b8acde4cf54b263203052 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 15 Oct 2019 16:51:01 -0700 Subject: [PATCH 049/116] Add big list of project references, for tests to use --- Directory.Build.targets | 1 + eng/IndirectReferences.props | 1571 ++++++++++++++++++++++++++++++++++ 2 files changed, 1572 insertions(+) create mode 100644 eng/IndirectReferences.props diff --git a/Directory.Build.targets b/Directory.Build.targets index 074b8c1c38d6..cccb022b6694 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -154,6 +154,7 @@ + diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props new file mode 100644 index 000000000000..688c7e381b1e --- /dev/null +++ b/eng/IndirectReferences.props @@ -0,0 +1,1571 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From c78f161984c08b3d37516a11de81e57cd7431b36 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 16 Oct 2019 10:35:36 -0700 Subject: [PATCH 050/116] Try fixing up condition in IndirectReferences.props --- eng/IndirectReferences.props | 248 +++++++++++++++++------------------ 1 file changed, 124 insertions(+), 124 deletions(-) diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props index 688c7e381b1e..db812b39efdb 100644 --- a/eng/IndirectReferences.props +++ b/eng/IndirectReferences.props @@ -1,5 +1,5 @@ - + @@ -13,7 +13,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -32,7 +32,7 @@ - + @@ -42,14 +42,14 @@ - + - + - + @@ -57,7 +57,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -88,19 +88,19 @@ - + - + - + @@ -110,7 +110,7 @@ - + @@ -130,7 +130,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -163,11 +163,11 @@ - + - + - + @@ -203,12 +203,12 @@ - + - + @@ -222,15 +222,15 @@ - + - + - + @@ -238,24 +238,24 @@ - + - + - + - + @@ -305,7 +305,7 @@ - + @@ -339,11 +339,11 @@ - + - + @@ -358,7 +358,7 @@ - + @@ -372,22 +372,22 @@ - + - + - + - + - + @@ -397,17 +397,17 @@ - + - + - + @@ -439,7 +439,7 @@ - + @@ -453,14 +453,14 @@ - + - + - + @@ -470,7 +470,7 @@ - + @@ -480,7 +480,7 @@ - + @@ -491,7 +491,7 @@ - + @@ -528,17 +528,17 @@ - + - + - + - + @@ -554,11 +554,11 @@ - + - + @@ -595,7 +595,7 @@ - + @@ -604,23 +604,23 @@ - + - + - + - + - + - + @@ -662,10 +662,10 @@ - + - + @@ -684,7 +684,7 @@ - + @@ -705,7 +705,7 @@ - + @@ -719,7 +719,7 @@ - + @@ -729,7 +729,7 @@ - + @@ -737,7 +737,7 @@ - + @@ -754,7 +754,7 @@ - + @@ -789,7 +789,7 @@ - + @@ -827,18 +827,18 @@ - + - + - + @@ -851,7 +851,7 @@ - + @@ -865,7 +865,7 @@ - + @@ -873,7 +873,7 @@ - + @@ -892,7 +892,7 @@ - + @@ -907,7 +907,7 @@ - + @@ -918,7 +918,7 @@ - + @@ -954,7 +954,7 @@ - + @@ -976,15 +976,15 @@ - + - + - + @@ -998,23 +998,23 @@ - + - + - + - + @@ -1066,9 +1066,9 @@ - + - + @@ -1084,7 +1084,7 @@ - + @@ -1107,9 +1107,9 @@ - + - + @@ -1121,12 +1121,12 @@ - + - + @@ -1141,7 +1141,7 @@ - + @@ -1155,7 +1155,7 @@ - + @@ -1167,12 +1167,12 @@ - + - + @@ -1192,7 +1192,7 @@ - + @@ -1207,7 +1207,7 @@ - + @@ -1251,13 +1251,13 @@ - + - + @@ -1265,7 +1265,7 @@ - + @@ -1306,12 +1306,12 @@ - + - + @@ -1326,17 +1326,17 @@ - + - + - + @@ -1351,7 +1351,7 @@ - + @@ -1385,21 +1385,21 @@ - + - + - + - + @@ -1410,7 +1410,7 @@ - + @@ -1420,7 +1420,7 @@ - + @@ -1470,14 +1470,14 @@ - + - + @@ -1486,17 +1486,17 @@ - + - + - + @@ -1523,7 +1523,7 @@ - + @@ -1543,21 +1543,21 @@ - + - + - + - + From aaca1ace758d5b6a8a140636507e389ba4d639e8 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 16 Oct 2019 10:45:22 -0700 Subject: [PATCH 051/116] Remove Microsoft.AspNetCore.Components.Web.JS from indirect references list --- eng/IndirectReferences.props | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props index db812b39efdb..33ac2c868e7a 100644 --- a/eng/IndirectReferences.props +++ b/eng/IndirectReferences.props @@ -316,7 +316,6 @@ - From 2940bf15d3437374aafa4365d7bd509331c680f8 Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 16 Oct 2019 13:39:45 -0700 Subject: [PATCH 052/116] Fix broken transitive references to extensions refs --- eng/targets/ResolveReferences.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index 46861966c73e..2206b5ebeff8 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -223,7 +223,7 @@ - + From a93d96d16bfe37ef25da91daaadee943f97bb443 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Oct 2019 21:29:40 +0000 Subject: [PATCH 053/116] Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191004.11 - Microsoft.EntityFrameworkCore.Tools - 3.0.1-servicing.19504.11 - Microsoft.EntityFrameworkCore.SqlServer - 3.0.1-servicing.19504.11 - dotnet-ef - 3.0.1-servicing.19504.11 - Microsoft.EntityFrameworkCore - 3.0.1-servicing.19504.11 - Microsoft.EntityFrameworkCore.InMemory - 3.0.1-servicing.19504.11 - Microsoft.EntityFrameworkCore.Relational - 3.0.1-servicing.19504.11 - Microsoft.EntityFrameworkCore.Sqlite - 3.0.1-servicing.19504.11 --- NuGet.config | 1 - eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 62613eda6d36..e32daea20147 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 87e48f164d4f..6231f2a2d951 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,33 +29,33 @@ https://github.com/aspnet/AspNetCore-Tooling 90395b97dad27649367ddc3698e410e783e58e8d - + https://github.com/aspnet/EntityFrameworkCore - 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 + 45facaff15408bb16a00c421e322d114bb3d54c5 - + https://github.com/aspnet/EntityFrameworkCore - 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 + 45facaff15408bb16a00c421e322d114bb3d54c5 - + https://github.com/aspnet/EntityFrameworkCore - 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 + 45facaff15408bb16a00c421e322d114bb3d54c5 - + https://github.com/aspnet/EntityFrameworkCore - 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 + 45facaff15408bb16a00c421e322d114bb3d54c5 - + https://github.com/aspnet/EntityFrameworkCore - 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 + 45facaff15408bb16a00c421e322d114bb3d54c5 - + https://github.com/aspnet/EntityFrameworkCore - 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 + 45facaff15408bb16a00c421e322d114bb3d54c5 - + https://github.com/aspnet/EntityFrameworkCore - 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 + 45facaff15408bb16a00c421e322d114bb3d54c5 https://github.com/aspnet/Extensions diff --git a/eng/Versions.props b/eng/Versions.props index efd73bb84cc4..4683b923eff8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -162,13 +162,13 @@ 3.0.1 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 + 3.0.1-servicing.19504.11 + 3.0.1-servicing.19504.11 + 3.0.1-servicing.19504.11 + 3.0.1-servicing.19504.11 + 3.0.1-servicing.19504.11 + 3.0.1-servicing.19504.11 + 3.0.1-servicing.19504.11 3.0.1 3.0.1 From 7bffa9c068a72ebaad12fc14c3376ba9238c5a28 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Oct 2019 21:29:55 +0000 Subject: [PATCH 054/116] Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191004.11 - Microsoft.NET.Sdk.Razor - 3.0.1-servicing.19504.11 - Microsoft.CodeAnalysis.Razor - 3.0.1-servicing.19504.11 - Microsoft.AspNetCore.Razor.Language - 3.0.1-servicing.19504.11 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.1-servicing.19504.11 --- NuGet.config | 1 - eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index e32daea20147..7dad46a5de0b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6231f2a2d951..9882329f1b7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,21 +13,21 @@ https://github.com/aspnet/Blazor c606594a0e5ebc36636d36e418ee0e189ce7a012 - + https://github.com/aspnet/AspNetCore-Tooling - 90395b97dad27649367ddc3698e410e783e58e8d + 108de1151b4d5e2eec15f2baecd069f9666121af - + https://github.com/aspnet/AspNetCore-Tooling - 90395b97dad27649367ddc3698e410e783e58e8d + 108de1151b4d5e2eec15f2baecd069f9666121af - + https://github.com/aspnet/AspNetCore-Tooling - 90395b97dad27649367ddc3698e410e783e58e8d + 108de1151b4d5e2eec15f2baecd069f9666121af - + https://github.com/aspnet/AspNetCore-Tooling - 90395b97dad27649367ddc3698e410e783e58e8d + 108de1151b4d5e2eec15f2baecd069f9666121af https://github.com/aspnet/EntityFrameworkCore diff --git a/eng/Versions.props b/eng/Versions.props index 4683b923eff8..02f1df550934 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -170,10 +170,10 @@ 3.0.1-servicing.19504.11 3.0.1-servicing.19504.11 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 + 3.0.1-servicing.19504.11 + 3.0.1-servicing.19504.11 + 3.0.1-servicing.19504.11 + 3.0.1-servicing.19504.11 - 3.0.1-servicing.19504.11 - 3.0.1-servicing.19504.11 - 3.0.1-servicing.19504.11 - 3.0.1-servicing.19504.11 + 3.0.1-servicing.19507.2 + 3.0.1-servicing.19507.2 + 3.0.1-servicing.19507.2 + 3.0.1-servicing.19507.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d20f1142b8b..4f8fd33e21e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,33 +29,33 @@ https://github.com/aspnet/AspNetCore-Tooling ae9d989c74c6f4850df8b612f4a91da87448a181 - + https://github.com/aspnet/EntityFrameworkCore - 45facaff15408bb16a00c421e322d114bb3d54c5 + 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 - + https://github.com/aspnet/EntityFrameworkCore - 45facaff15408bb16a00c421e322d114bb3d54c5 + 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 - + https://github.com/aspnet/EntityFrameworkCore - 45facaff15408bb16a00c421e322d114bb3d54c5 + 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 - + https://github.com/aspnet/EntityFrameworkCore - 45facaff15408bb16a00c421e322d114bb3d54c5 + 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 - + https://github.com/aspnet/EntityFrameworkCore - 45facaff15408bb16a00c421e322d114bb3d54c5 + 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 - + https://github.com/aspnet/EntityFrameworkCore - 45facaff15408bb16a00c421e322d114bb3d54c5 + 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 - + https://github.com/aspnet/EntityFrameworkCore - 45facaff15408bb16a00c421e322d114bb3d54c5 + 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 https://github.com/aspnet/Extensions diff --git a/eng/Versions.props b/eng/Versions.props index 12c67cb6e07b..01e1bd213af6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -162,13 +162,13 @@ 3.0.1 3.0.1 - 3.0.1-servicing.19504.11 - 3.0.1-servicing.19504.11 - 3.0.1-servicing.19504.11 - 3.0.1-servicing.19504.11 - 3.0.1-servicing.19504.11 - 3.0.1-servicing.19504.11 - 3.0.1-servicing.19504.11 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 3.0.1-servicing.19507.2 3.0.1-servicing.19507.2 From 4652d826f027dbe19c2136c953e1ada1dca291ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Oct 2019 21:30:52 +0000 Subject: [PATCH 057/116] Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191010.4 - Microsoft.EntityFrameworkCore.Tools - 3.0.1 - Microsoft.EntityFrameworkCore.SqlServer - 3.0.1 - dotnet-ef - 3.0.1 - Microsoft.EntityFrameworkCore - 3.0.1 - Microsoft.EntityFrameworkCore.InMemory - 3.0.1 - Microsoft.EntityFrameworkCore.Relational - 3.0.1 - Microsoft.EntityFrameworkCore.Sqlite - 3.0.1 --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index e70e8b76815c..e0a905ae5e55 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4f8fd33e21e8..042678cd686e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -31,31 +31,31 @@ https://github.com/aspnet/EntityFrameworkCore - 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 + e2fe2f425e976394d933ad5fcf304fd3de6759f5 https://github.com/aspnet/EntityFrameworkCore - 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 + e2fe2f425e976394d933ad5fcf304fd3de6759f5 https://github.com/aspnet/EntityFrameworkCore - 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 + e2fe2f425e976394d933ad5fcf304fd3de6759f5 https://github.com/aspnet/EntityFrameworkCore - 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 + e2fe2f425e976394d933ad5fcf304fd3de6759f5 https://github.com/aspnet/EntityFrameworkCore - 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 + e2fe2f425e976394d933ad5fcf304fd3de6759f5 https://github.com/aspnet/EntityFrameworkCore - 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 + e2fe2f425e976394d933ad5fcf304fd3de6759f5 https://github.com/aspnet/EntityFrameworkCore - 950fbeb5eb6f8f27d73cd98bf98a2915015f0394 + e2fe2f425e976394d933ad5fcf304fd3de6759f5 https://github.com/aspnet/Extensions From 25d88e36e319ee66c2c3756af4af24593052f6c0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Oct 2019 21:31:10 +0000 Subject: [PATCH 058/116] Dependency coherency updates - Microsoft.AspNetCore.Analyzer.Testing - 3.0.1-servicing.19510.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.1-servicing.19510.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.1-servicing.19510.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources - 3.0.1-servicing.19510.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.1-servicing.19510.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.1-servicing.19510.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing - 3.0.1-servicing.19510.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.1-servicing.19510.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources - 3.0.1-servicing.19510.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources - 3.0.1-servicing.19510.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Mono.WebAssembly.Interop - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.1 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyModel - 3.0.1 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Ref - 3.0.1 (parent: Microsoft.Extensions.Logging) - NETStandard.Library.Ref - 2.1.0 (parent: Microsoft.Extensions.Logging) - Internal.AspNetCore.Analyzers - 3.0.1-servicing.19510.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing - 3.0.1-servicing.19510.1 (parent: Microsoft.EntityFrameworkCore) --- NuGet.config | 5 +- eng/Version.Details.xml | 154 ++++++++++++++++++++-------------------- eng/Versions.props | 26 +++---- 3 files changed, 92 insertions(+), 93 deletions(-) diff --git a/NuGet.config b/NuGet.config index e0a905ae5e55..afffdf8a079c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,10 +3,9 @@ - - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 042678cd686e..ee18a016c512 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,237 +57,237 @@ https://github.com/aspnet/EntityFrameworkCore e2fe2f425e976394d933ad5fcf304fd3de6759f5 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/dotnet/corefx @@ -379,7 +379,7 @@ https://github.com/dotnet/core-setup - f8bfa4242fb299c1d1a635c069dbfec7870a023b + 903ca49e3ffddc551e12d2f94d7cca95f9a340bf https://github.com/dotnet/core-setup - f8bfa4242fb299c1d1a635c069dbfec7870a023b + 903ca49e3ffddc551e12d2f94d7cca95f9a340bf https://github.com/dotnet/core-setup - f8bfa4242fb299c1d1a635c069dbfec7870a023b + 903ca49e3ffddc551e12d2f94d7cca95f9a340bf - + https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 + 903ca49e3ffddc551e12d2f94d7cca95f9a340bf https://github.com/aspnet/Extensions @@ -409,9 +409,9 @@ https://github.com/dotnet/corefx 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/dotnet/arcade @@ -425,9 +425,9 @@ https://github.com/dotnet/arcade 0e9ffd6464aff37aef2dc41dc2162d258f266e32 - + https://github.com/aspnet/Extensions - 0e82b48369290d71f976d96f8880ed24a710a0b2 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 01e1bd213af6..21af41cd17f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,7 +69,7 @@ 3.3.1-beta4-19462-11 3.0.1 - 3.0.0 + 3.0.1 3.0.1 2.1.0 @@ -100,16 +100,16 @@ 3.0.0-preview9.19503.2 - 3.0.1-servicing.19506.5 - 3.0.1-servicing.19506.5 - 3.0.1-servicing.19506.5 - 3.0.1-servicing.19506.5 - 3.0.1-servicing.19506.5 + 3.0.1-servicing.19510.1 + 3.0.1-servicing.19510.1 + 3.0.1-servicing.19510.1 + 3.0.1-servicing.19510.1 + 3.0.1-servicing.19510.1 3.0.1 3.0.1 3.0.1 3.0.1 - 3.0.1-servicing.19506.5 + 3.0.1-servicing.19510.1 3.0.1 3.0.1 3.0.1 @@ -132,10 +132,10 @@ 3.0.1 3.0.1 3.0.1 - 3.0.1-servicing.19506.5 + 3.0.1-servicing.19510.1 3.0.1 3.0.1 - 3.0.1-servicing.19506.5 + 3.0.1-servicing.19510.1 3.0.1 3.0.1 3.0.1 @@ -147,16 +147,16 @@ 3.0.1 3.0.1 3.0.1 - 3.0.1-servicing.19506.5 + 3.0.1-servicing.19510.1 3.0.1 3.0.1 3.0.1 3.0.1 3.0.1 - 3.0.1-servicing.19506.5 + 3.0.1-servicing.19510.1 3.0.1 - 3.0.1-servicing.19506.5 - 3.0.1-servicing.19506.5 + 3.0.1-servicing.19510.1 + 3.0.1-servicing.19510.1 3.0.1 3.0.0-rc2.19463.5 3.0.1 From 46cd240ba5eed9870ec587d52ea69f3d3b3ea655 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 16 Oct 2019 15:54:50 -0700 Subject: [PATCH 059/116] Add Extensions references to IndirectReferences.props --- eng/IndirectReferences.props | 191 +++++++++++++++++++++++++++++++---- 1 file changed, 173 insertions(+), 18 deletions(-) diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props index 33ac2c868e7a..cdf636d3dce4 100644 --- a/eng/IndirectReferences.props +++ b/eng/IndirectReferences.props @@ -1,24 +1,30 @@ - + + + + + + - - + + + @@ -29,18 +35,28 @@ - + + + + - + + + + + + + + + - @@ -71,26 +87,31 @@ - + + - - + + + + + + @@ -104,9 +125,11 @@ + + @@ -152,20 +175,24 @@ - - - + + + + + + + @@ -180,9 +207,11 @@ + + @@ -192,6 +221,7 @@ + @@ -228,15 +258,20 @@ + + + + + @@ -245,6 +280,8 @@ + + @@ -252,7 +289,9 @@ + + @@ -308,16 +347,21 @@ + + + + + @@ -339,6 +383,7 @@ + @@ -381,10 +426,12 @@ + + @@ -394,6 +441,7 @@ + @@ -403,6 +451,7 @@ + @@ -419,6 +468,7 @@ + @@ -457,6 +507,7 @@ + @@ -464,9 +515,12 @@ + + + @@ -474,6 +528,7 @@ + @@ -481,6 +536,7 @@ + @@ -507,6 +563,7 @@ + @@ -529,11 +586,16 @@ + + + + + @@ -542,6 +604,7 @@ + @@ -556,9 +619,12 @@ + + + @@ -568,6 +634,7 @@ + @@ -599,28 +666,41 @@ + + + + + + + + + + + + + @@ -679,6 +759,7 @@ + @@ -724,9 +805,13 @@ + + + + @@ -734,7 +819,10 @@ + + + @@ -763,11 +851,13 @@ + + @@ -827,6 +917,7 @@ + @@ -842,13 +933,15 @@ + + + + - - - + @@ -867,9 +960,11 @@ + + @@ -877,7 +972,9 @@ + + @@ -887,9 +984,14 @@ + + + + + @@ -908,6 +1010,7 @@ + @@ -955,9 +1058,11 @@ + + @@ -974,14 +1079,18 @@ + + + + @@ -1000,17 +1109,21 @@ + + + + @@ -1043,6 +1156,7 @@ + @@ -1066,6 +1180,7 @@ + @@ -1110,6 +1225,7 @@ + @@ -1155,19 +1271,23 @@ - + + + + - - + + + @@ -1182,6 +1302,7 @@ + @@ -1209,6 +1330,7 @@ + @@ -1227,6 +1349,7 @@ + @@ -1259,6 +1382,7 @@ + @@ -1289,6 +1413,7 @@ + @@ -1321,8 +1446,10 @@ + + @@ -1333,7 +1460,9 @@ + + @@ -1394,7 +1523,9 @@ + + @@ -1414,6 +1545,8 @@ + + @@ -1491,6 +1624,8 @@ + + @@ -1501,24 +1636,35 @@ + + + + + + + + + + + @@ -1543,21 +1689,30 @@ + + + + + + + + + From 45dcd6cddb717545e27d586ab83511b62ad09543 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 16 Oct 2019 15:59:54 -0700 Subject: [PATCH 060/116] Include props file in more places --- Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index cccb022b6694..5cc9bcea0152 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -154,7 +154,7 @@ - + From fc19c384c340664b363447902f6059034db2bce3 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 16 Oct 2019 16:07:03 -0700 Subject: [PATCH 061/116] Remove ref to components.web.js --- eng/IndirectReferences.props | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props index cdf636d3dce4..d8b90e59a07d 100644 --- a/eng/IndirectReferences.props +++ b/eng/IndirectReferences.props @@ -358,7 +358,6 @@ - From 43ad880f3035151275d7bd7493e22477a21a74b2 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 16 Oct 2019 16:17:54 -0700 Subject: [PATCH 062/116] Fix warnings --- eng/IndirectReferences.props | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props index d8b90e59a07d..a6a479685587 100644 --- a/eng/IndirectReferences.props +++ b/eng/IndirectReferences.props @@ -43,7 +43,6 @@ - @@ -99,7 +98,6 @@ - @@ -211,7 +209,6 @@ - @@ -281,7 +278,6 @@ - @@ -360,7 +356,6 @@ - @@ -623,7 +618,6 @@ - @@ -683,7 +677,6 @@ - @@ -856,7 +849,6 @@ - @@ -971,7 +963,6 @@ - @@ -1286,7 +1277,6 @@ - @@ -1329,7 +1319,6 @@ - @@ -1348,7 +1337,6 @@ - @@ -1623,7 +1611,6 @@ - From 7d094a7c67205ee1e70c752f85e2503afa60aee6 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 16 Oct 2019 17:10:41 -0700 Subject: [PATCH 063/116] Add p2p references from Extensions to IndirectReferences.props --- eng/IndirectReferences.props | 376 ++++++++++++++++++++++++++++------- 1 file changed, 307 insertions(+), 69 deletions(-) diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props index a6a479685587..2eb7bc87395d 100644 --- a/eng/IndirectReferences.props +++ b/eng/IndirectReferences.props @@ -8,10 +8,14 @@ + + + + @@ -20,7 +24,9 @@ + + @@ -40,6 +46,17 @@ + + + + + + + + + + + @@ -47,15 +64,11 @@ - - - + - - + - @@ -92,6 +105,9 @@ + + + @@ -100,19 +116,33 @@ + + + + + - - + - + + + + + + + + + + + @@ -120,16 +150,23 @@ - + + + + + + + + + - - + @@ -182,6 +219,8 @@ + + @@ -207,8 +246,11 @@ + + + @@ -216,6 +258,7 @@ + @@ -260,7 +303,9 @@ + + @@ -277,13 +322,23 @@ - + + + + + + + + + + + @@ -351,24 +406,34 @@ + + + + + + + + + + @@ -377,6 +442,8 @@ + + @@ -419,7 +486,9 @@ + + @@ -445,6 +514,7 @@ + @@ -459,7 +529,9 @@ + + @@ -470,6 +542,7 @@ + @@ -508,19 +581,25 @@ - - + + + + + + + - + + @@ -530,15 +609,31 @@ + + + + + + + + + + + + + - - - + + + + + + + - - + @@ -580,12 +675,16 @@ + + + + @@ -606,15 +705,23 @@ + + + + + + + + @@ -626,13 +733,17 @@ + + + + @@ -640,6 +751,7 @@ + @@ -657,35 +769,49 @@ + + + + - - + + + + + + + + + + + + @@ -707,7 +833,9 @@ + + @@ -726,6 +854,7 @@ + @@ -792,24 +921,27 @@ - + + + + + - - - + + @@ -846,9 +978,13 @@ + + + + @@ -856,6 +992,7 @@ + @@ -863,6 +1000,7 @@ + @@ -910,9 +1048,14 @@ + + + + + @@ -928,7 +1071,9 @@ + + @@ -950,6 +1095,8 @@ + + @@ -960,28 +1107,30 @@ + + + + + + + + + + + + - - - - - - - - - - @@ -1048,28 +1197,51 @@ - - - - - - + + - - + - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1077,6 +1249,8 @@ + + @@ -1097,10 +1271,17 @@ + + + + + + + @@ -1110,7 +1291,9 @@ + + @@ -1125,8 +1308,10 @@ + + @@ -1141,6 +1326,7 @@ + @@ -1219,12 +1405,15 @@ - + + + + + - @@ -1263,12 +1452,15 @@ + + + @@ -1279,6 +1471,7 @@ + @@ -1287,19 +1480,24 @@ + + + + + @@ -1323,41 +1521,46 @@ - - - - - - - + - + + - - - - + + + + + + + + + + + + + + + + + + - - - - @@ -1368,6 +1571,8 @@ + + @@ -1390,6 +1595,7 @@ + @@ -1404,12 +1610,14 @@ + + @@ -1446,6 +1654,8 @@ + + @@ -1508,7 +1718,9 @@ + + @@ -1531,13 +1743,17 @@ - - + + + + + + + - @@ -1611,9 +1827,16 @@ + - + + + + + + + @@ -1628,15 +1851,20 @@ + + + + + @@ -1645,14 +1873,20 @@ + + + + + + @@ -1681,6 +1915,8 @@ + + @@ -1689,6 +1925,8 @@ + + From ab5368752ad1d1e4c5f4d8de2edf18cb31bc6b73 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 17 Oct 2019 09:39:46 -0700 Subject: [PATCH 064/116] Remove PrivateAssets refs, add back manual removals --- eng/IndirectReferences.props | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props index 2eb7bc87395d..567046970572 100644 --- a/eng/IndirectReferences.props +++ b/eng/IndirectReferences.props @@ -46,6 +46,7 @@ + @@ -114,6 +115,7 @@ + @@ -128,6 +130,7 @@ + @@ -251,6 +254,7 @@ + @@ -322,6 +326,7 @@ + @@ -398,6 +403,7 @@ + @@ -411,13 +417,14 @@ - + + @@ -609,6 +616,7 @@ + @@ -714,6 +722,7 @@ + @@ -725,6 +734,7 @@ + @@ -794,6 +804,7 @@ + @@ -835,7 +846,6 @@ - @@ -985,6 +995,7 @@ + @@ -1107,6 +1118,7 @@ + @@ -1198,6 +1210,7 @@ + @@ -1272,6 +1285,7 @@ + @@ -1311,7 +1325,6 @@ - @@ -1469,6 +1482,7 @@ + @@ -1542,6 +1556,7 @@ + @@ -1551,6 +1566,7 @@ + @@ -1827,6 +1843,7 @@ + @@ -1843,6 +1860,7 @@ + From 6036d8cf502e1f68e752d8f860362e8351d322f3 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 17 Oct 2019 09:40:54 -0700 Subject: [PATCH 065/116] Remove web.js (again) --- eng/IndirectReferences.props | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props index 567046970572..78e6f62ac68d 100644 --- a/eng/IndirectReferences.props +++ b/eng/IndirectReferences.props @@ -417,7 +417,6 @@ - From 2a9c23b136a21a73becbd11f69e7214c22eaa441 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 17 Oct 2019 10:58:28 -0700 Subject: [PATCH 066/116] Add refs for test -> Extensions -> P2P --- eng/IndirectReferences.props | 404 +++++++++++++++++++++++++++++++++++ 1 file changed, 404 insertions(+) diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props index 78e6f62ac68d..66e3a0bc7a49 100644 --- a/eng/IndirectReferences.props +++ b/eng/IndirectReferences.props @@ -1959,6 +1959,410 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From e48651dc99d9052b859800978c32e08150e2fd91 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 17 Oct 2019 12:46:50 -0700 Subject: [PATCH 067/116] Add one more class of indirect references --- eng/IndirectReferences.props | 1619 ++++++++++++++++++++++++++-------- 1 file changed, 1228 insertions(+), 391 deletions(-) diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props index 66e3a0bc7a49..e05a690cdfb1 100644 --- a/eng/IndirectReferences.props +++ b/eng/IndirectReferences.props @@ -1,48 +1,75 @@ + + + + + + + + + + + + - - - - - - - - + - + + + + + - - + - - + - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -54,6 +81,7 @@ + @@ -70,48 +98,80 @@ + + + + + + + + + + + + + + + - + + + - + + + + + + + + + + + + + + + + @@ -122,13 +182,17 @@ + + + + @@ -139,7 +203,9 @@ + + @@ -149,6 +215,8 @@ + + @@ -166,53 +234,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - + + + + - - - - + + + + - - + - - - - - + + - + + @@ -221,12 +321,16 @@ + + + + @@ -239,88 +343,124 @@ - - - - - - + + - + - + - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - + + + + + + + + + + + - - + + + + + + + + + + + + + - - - - + @@ -335,15 +475,19 @@ + + + + @@ -351,151 +495,218 @@ - - - - - - - - - - + + + + - + + - - + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - + - + + + + + + + + + - + + + + + + + + - + + + + + + + + + + + + + + + + @@ -504,17 +715,27 @@ - + + + + + + + + + + - + + @@ -522,31 +743,42 @@ + + + + + + + + + + + @@ -554,37 +786,52 @@ + + + - + + + + + + + + + + + - - + + + + @@ -593,25 +840,34 @@ + + + + - - - + + + + + + + - + + @@ -622,18 +878,22 @@ + + + + @@ -641,43 +901,64 @@ + - - - - - - - + + + - + + + - - - + + + - + + - - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -692,6 +973,7 @@ + @@ -713,9 +995,14 @@ + + + + + @@ -733,46 +1020,59 @@ - - - - - - - - - + + - + - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - @@ -784,7 +1084,9 @@ + + @@ -804,7 +1106,9 @@ + + @@ -825,109 +1129,173 @@ + + + - - - - - - - - + + + - - + + + - - + + + - + + + - - - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - + - + - - - - + - - - + - + + + + - + + + + + + + + + + + + + + + + + - + + + + + + + + + + + - - + + @@ -939,82 +1307,116 @@ + + + + - + - + + + + + + - - - - - + - + - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + - - - - - - - - - - - - @@ -1022,37 +1424,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - - + - - + + + + - - - - - - + - - - - @@ -1061,6 +1490,7 @@ + @@ -1068,12 +1498,20 @@ + + + + + + + + @@ -1081,39 +1519,66 @@ + + + + - - - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - @@ -1121,139 +1586,200 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - + - - + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - @@ -1263,6 +1789,7 @@ + @@ -1270,17 +1797,27 @@ - + + + + + + + + + + + - - + + @@ -1299,7 +1836,9 @@ + + @@ -1307,6 +1846,7 @@ + @@ -1320,30 +1860,45 @@ + + + + + + + + + + + + + + + @@ -1351,15 +1906,22 @@ + + + + + + + @@ -1372,160 +1934,253 @@ + + + + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - + + - + - - - + + - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + - - + + + + + + + + + + + + + - - - - - - + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1534,27 +2189,38 @@ + + + + + + + + + + + @@ -1562,9 +2228,12 @@ + + + @@ -1579,21 +2248,35 @@ + - + + + + + + + + + + + + + + + + - - - + @@ -1601,46 +2284,74 @@ - - - - - - + + + - - + + + - - + + + - + + - - - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1649,6 +2360,7 @@ + @@ -1656,21 +2368,32 @@ + + + + + + + + + + + @@ -1678,57 +2401,91 @@ + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + - - - - - - - - - + + + + + + + @@ -1736,26 +2493,37 @@ + + - + + + + + + + + + - - + + + @@ -1764,79 +2532,118 @@ + + + + - - - - - - - - - - + + + + - + + - - + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - + + + + + + + + + + + @@ -1850,6 +2657,7 @@ + @@ -1858,72 +2666,91 @@ - - - - - - - - + - - + - - - + - - - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - + + - + @@ -1933,7 +2760,9 @@ + + @@ -1943,7 +2772,9 @@ + + @@ -1952,12 +2783,18 @@ + + + + + + From 91ecfada84fd99a06b88de1ca2707dfd5762ac88 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 17 Oct 2019 12:56:14 -0700 Subject: [PATCH 068/116] Don't build refPack during source build --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 3d34aa1c8315..4eb0a65e9290 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -94,7 +94,7 @@ false - true + true <_BaselinePackageReferenceWithVersion Include="@(Reference)" Condition=" '$(IsServicingBuild)' == 'true' OR '$(UseLatestPackageReferences)' != 'true' "> From ef16cae061b79bdd7fb544031f7dbe1d1be1ff9d Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 17 Oct 2019 15:57:33 -0700 Subject: [PATCH 071/116] Fix ItemGroup tag --- eng/targets/ResolveReferences.targets | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index e0a3fe421932..530d49d56f6f 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -230,7 +230,6 @@ true - <_BaselinePackageReferenceWithVersion Include="@(Reference)" Condition=" '$(IsServicingBuild)' == 'true' OR '$(UseLatestPackageReferences)' != 'true' "> From c0ae394a31793223cb847124a1564d3feaf63572 Mon Sep 17 00:00:00 2001 From: John Luo Date: Thu, 17 Oct 2019 16:02:12 -0700 Subject: [PATCH 072/116] Cleanup --- src/Mvc/Mvc.Razor/src/Infrastructure/CryptographyAlgorithms.cs | 2 +- .../Mvc.Razor/src/Infrastructure/DefaultFileVersionProvider.cs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Mvc/Mvc.Razor/src/Infrastructure/CryptographyAlgorithms.cs b/src/Mvc/Mvc.Razor/src/Infrastructure/CryptographyAlgorithms.cs index c06a3b2d7e35..24423154772a 100644 --- a/src/Mvc/Mvc.Razor/src/Infrastructure/CryptographyAlgorithms.cs +++ b/src/Mvc/Mvc.Razor/src/Infrastructure/CryptographyAlgorithms.cs @@ -22,4 +22,4 @@ public static SHA256 CreateSHA256() } } } -} \ No newline at end of file +} diff --git a/src/Mvc/Mvc.Razor/src/Infrastructure/DefaultFileVersionProvider.cs b/src/Mvc/Mvc.Razor/src/Infrastructure/DefaultFileVersionProvider.cs index 5bf37a320c16..a58bf6252db4 100644 --- a/src/Mvc/Mvc.Razor/src/Infrastructure/DefaultFileVersionProvider.cs +++ b/src/Mvc/Mvc.Razor/src/Infrastructure/DefaultFileVersionProvider.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Antiforgery; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.ViewFeatures; From efabc6ab0b279decd753097caf4709072d276dc5 Mon Sep 17 00:00:00 2001 From: John Luo Date: Thu, 17 Oct 2019 16:23:25 -0700 Subject: [PATCH 073/116] Exclude sources files from indirect references The types in these packages will be compiled into the binaries of the projects that directly depended o it --- eng/IndirectReferences.props | 244 ----------------------------------- 1 file changed, 244 deletions(-) diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props index b9941fe4a7f5..43b00e5b1444 100644 --- a/eng/IndirectReferences.props +++ b/eng/IndirectReferences.props @@ -6,9 +6,7 @@ - - @@ -16,7 +14,6 @@ - @@ -35,7 +32,6 @@ - @@ -52,7 +48,6 @@ - @@ -62,7 +57,6 @@ - @@ -81,7 +75,6 @@ - @@ -91,7 +84,6 @@ - @@ -124,7 +116,6 @@ - @@ -142,14 +133,12 @@ - - @@ -158,7 +147,6 @@ - @@ -169,7 +157,6 @@ - @@ -187,7 +174,6 @@ - @@ -208,7 +194,6 @@ - @@ -219,7 +204,6 @@ - @@ -237,9 +221,7 @@ - - @@ -256,25 +238,20 @@ - - - - - @@ -290,25 +267,20 @@ - - - - - @@ -329,7 +301,6 @@ - @@ -353,9 +324,7 @@ - - @@ -363,14 +332,12 @@ - - @@ -388,7 +355,6 @@ - @@ -402,7 +368,6 @@ - @@ -425,7 +390,6 @@ - @@ -440,14 +404,11 @@ - - - @@ -458,7 +419,6 @@ - @@ -473,7 +433,6 @@ - @@ -481,7 +440,6 @@ - @@ -496,7 +454,6 @@ - @@ -508,7 +465,6 @@ - @@ -528,10 +484,8 @@ - - @@ -542,7 +496,6 @@ - @@ -550,7 +503,6 @@ - @@ -572,7 +524,6 @@ - @@ -595,9 +546,7 @@ - - @@ -609,7 +558,6 @@ - @@ -642,7 +590,6 @@ - @@ -664,7 +611,6 @@ - @@ -684,7 +630,6 @@ - @@ -695,7 +640,6 @@ - @@ -723,7 +667,6 @@ - @@ -732,7 +675,6 @@ - @@ -747,7 +689,6 @@ - @@ -756,19 +697,15 @@ - - - - @@ -788,13 +725,10 @@ - - - @@ -803,7 +737,6 @@ - @@ -811,7 +744,6 @@ - @@ -837,7 +769,6 @@ - @@ -851,13 +782,11 @@ - - @@ -872,7 +801,6 @@ - @@ -892,7 +820,6 @@ - @@ -912,7 +839,6 @@ - @@ -923,7 +849,6 @@ - @@ -943,9 +868,7 @@ - - @@ -954,13 +877,11 @@ - - @@ -978,7 +899,6 @@ - @@ -1000,10 +920,8 @@ - - @@ -1026,9 +944,7 @@ - - @@ -1058,9 +974,7 @@ - - @@ -1068,13 +982,11 @@ - - @@ -1092,7 +1004,6 @@ - @@ -1113,10 +1024,8 @@ - - @@ -1136,7 +1045,6 @@ - @@ -1159,7 +1067,6 @@ - @@ -1178,9 +1085,7 @@ - - @@ -1190,14 +1095,12 @@ - - @@ -1222,7 +1125,6 @@ - @@ -1251,9 +1153,7 @@ - - @@ -1267,7 +1167,6 @@ - @@ -1284,25 +1183,20 @@ - - - - - @@ -1323,7 +1217,6 @@ - @@ -1342,9 +1235,7 @@ - - @@ -1361,7 +1252,6 @@ - @@ -1378,7 +1268,6 @@ - @@ -1407,9 +1296,7 @@ - - @@ -1417,13 +1304,11 @@ - - @@ -1441,7 +1326,6 @@ - @@ -1465,9 +1349,7 @@ - - @@ -1476,14 +1358,12 @@ - - @@ -1505,7 +1385,6 @@ - @@ -1524,7 +1403,6 @@ - @@ -1558,7 +1436,6 @@ - @@ -1577,7 +1454,6 @@ - @@ -1588,7 +1464,6 @@ - @@ -1608,7 +1483,6 @@ - @@ -1624,25 +1498,20 @@ - - - - - @@ -1664,7 +1533,6 @@ - @@ -1673,7 +1541,6 @@ - @@ -1686,18 +1553,15 @@ - - - @@ -1716,9 +1580,7 @@ - - @@ -1726,13 +1588,11 @@ - - @@ -1750,7 +1610,6 @@ - @@ -1772,9 +1631,7 @@ - - @@ -1784,13 +1641,11 @@ - - @@ -1806,9 +1661,7 @@ - - @@ -1822,7 +1675,6 @@ - @@ -1839,10 +1691,8 @@ - - @@ -1853,7 +1703,6 @@ - @@ -1863,7 +1712,6 @@ - @@ -1888,7 +1736,6 @@ - @@ -1906,7 +1753,6 @@ - @@ -1920,7 +1766,6 @@ - @@ -1945,7 +1790,6 @@ - @@ -1967,7 +1811,6 @@ - @@ -1993,8 +1836,6 @@ - - @@ -2002,7 +1843,6 @@ - @@ -2023,10 +1863,8 @@ - - @@ -2037,7 +1875,6 @@ - @@ -2045,7 +1882,6 @@ - @@ -2069,7 +1905,6 @@ - @@ -2105,7 +1940,6 @@ - @@ -2125,9 +1959,7 @@ - - @@ -2142,7 +1974,6 @@ - @@ -2165,8 +1996,6 @@ - - @@ -2189,7 +2018,6 @@ - @@ -2200,7 +2028,6 @@ - @@ -2214,7 +2041,6 @@ - @@ -2235,7 +2061,6 @@ - @@ -2259,7 +2084,6 @@ - @@ -2280,9 +2104,7 @@ - - @@ -2316,25 +2138,20 @@ - - - - - @@ -2356,7 +2173,6 @@ - @@ -2387,13 +2203,11 @@ - - @@ -2414,7 +2228,6 @@ - @@ -2445,9 +2258,7 @@ - - @@ -2507,10 +2318,8 @@ - - @@ -2520,14 +2329,12 @@ - - @@ -2545,7 +2352,6 @@ - @@ -2584,7 +2390,6 @@ - @@ -2603,9 +2408,7 @@ - - @@ -2615,14 +2418,12 @@ - - @@ -2645,7 +2446,6 @@ - @@ -2661,7 +2461,6 @@ - @@ -2682,9 +2481,7 @@ - - @@ -2700,7 +2497,6 @@ - @@ -2708,7 +2504,6 @@ - @@ -2717,7 +2512,6 @@ - @@ -2740,7 +2534,6 @@ - @@ -2757,21 +2550,17 @@ - - - - @@ -2788,7 +2577,6 @@ - @@ -2800,7 +2588,6 @@ - @@ -2820,7 +2607,6 @@ - @@ -2839,10 +2625,8 @@ - - @@ -2861,7 +2645,6 @@ - @@ -2882,10 +2665,8 @@ - - @@ -2896,7 +2677,6 @@ - @@ -2904,7 +2684,6 @@ - @@ -2926,7 +2705,6 @@ - @@ -2946,7 +2724,6 @@ - @@ -2962,7 +2739,6 @@ - @@ -2970,7 +2746,6 @@ - @@ -2984,7 +2759,6 @@ - @@ -3007,11 +2781,9 @@ - - @@ -3030,7 +2802,6 @@ - @@ -3052,9 +2823,7 @@ - - @@ -3089,7 +2858,6 @@ - @@ -3102,9 +2870,7 @@ - - @@ -3114,7 +2880,6 @@ - @@ -3157,31 +2922,25 @@ - - - - - - @@ -3190,7 +2949,6 @@ - @@ -3202,7 +2960,6 @@ - @@ -3216,7 +2973,6 @@ - From b1a8fb7774b98248ae6ed32e3d3872e4475e5c0a Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 17 Oct 2019 16:46:38 -0700 Subject: [PATCH 074/116] Fix JSInterop --- eng/IndirectReferences.props | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props index 43b00e5b1444..0dece813f813 100644 --- a/eng/IndirectReferences.props +++ b/eng/IndirectReferences.props @@ -586,6 +586,7 @@ + @@ -1515,6 +1516,7 @@ + From e01e3d94601561376ae98a7fc065b770c9d2210c Mon Sep 17 00:00:00 2001 From: John Luo Date: Thu, 17 Oct 2019 23:28:01 -0700 Subject: [PATCH 075/116] Add manual indirect references to project references --- eng/IndirectReferences.props | 235 ++++++++++++++++++ ...soft.AspNetCore.Components.E2ETests.csproj | 1 + ...soft.AspNetCore.Mvc.FunctionalTests.csproj | 1 + 3 files changed, 237 insertions(+) diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props index 0dece813f813..615a9e15f059 100644 --- a/eng/IndirectReferences.props +++ b/eng/IndirectReferences.props @@ -3414,6 +3414,241 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj index a9d70ce0f827..bb38838369e1 100644 --- a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj +++ b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj @@ -27,6 +27,7 @@ + diff --git a/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj b/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj index b187f058e78a..8d938094ed04 100644 --- a/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj +++ b/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj @@ -32,6 +32,7 @@ + From ce009ba146231752b4fef30ba196171429f4e8fc Mon Sep 17 00:00:00 2001 From: John Luo Date: Thu, 17 Oct 2019 23:30:12 -0700 Subject: [PATCH 076/116] Do not substitute ext ref assemblies in ref pack --- src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj index 4f34f355d5a5..f09e7229e06f 100644 --- a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj +++ b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj @@ -18,6 +18,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant DotnetPlatform ref/$(TargetFramework)/ + + true + false From 5d40c6d1c2b10fc5673f0985799a3f56107022e4 Mon Sep 17 00:00:00 2001 From: John Luo Date: Fri, 18 Oct 2019 00:38:10 -0700 Subject: [PATCH 077/116] Remove assembly list hack --- eng/targets/ResolveReferences.targets | 57 +-------------------------- 1 file changed, 1 insertion(+), 56 deletions(-) diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index 530d49d56f6f..e0bae2ce0a4d 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -161,62 +161,7 @@ - - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.Abstractions" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.Memory" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.SqlServer" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.StackExchangeRedis" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.Abstractions" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.AzureKeyVault" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.Binder" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.CommandLine" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.EnvironmentVariables" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.FileExtensions" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.Ini" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.Json" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.KeyPerFile" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.NewtonsoftJson" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.UserSecrets" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.DependencyInjection.Abstractions" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.DependencyInjection" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.DiagnosticAdapter" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Diagnostics.HealthChecks" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileProviders.Abstractions" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileProviders.Composite" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileProviders.Embedded" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileProviders.Physical" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileSystemGlobbing" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Hosting.Abstractions" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Hosting" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Hosting.Systemd" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Hosting.WindowsServices" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Http" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Http.Polly" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Localization.Abstractions" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Localization" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.Abstractions" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.AzureAppServices" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.Configuration" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.Console" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.Debug" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.EventLog" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.EventSource" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.TraceSource" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.ObjectPool" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Options.ConfigurationExtensions" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Options.DataAnnotations" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Options" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Primitives" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.WebEncoders" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.JSInterop" /> - <_ExtensionInternalRefAssemblies Include="Mono.WebAssembly.Interop" /> - - - <_NonExtensionPackageReferences Include="@(_LatestPackageReferenceWithVersion)" Exclude="@(_ExtensionInternalRefAssemblies)" /> - <_ExtensionPackageReferences Include="@(_LatestPackageReferenceWithVersion)" Exclude="@(_NonExtensionPackageReferences)" /> + <_ExtensionPackageReferences Include="@(_LatestPackageReferenceWithVersion)" Condition=" Exists('$(MicrosoftInternalExtensionsRefsPath)%(FileName).dll') " /> <_LatestPackageReferenceWithVersion Remove="@(_ExtensionPackageReferences)" /> From 6c18c9ad35d24395aa0e7fc811c412eb2712be62 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 18 Oct 2019 09:36:20 -0700 Subject: [PATCH 078/116] Increase timeout to 5 hours (!) --- .azure/pipelines/jobs/default-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index 6004bc15a8bc..3260269d9e46 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -58,7 +58,7 @@ parameters: installTar: true installNodeJs: true installJdk: true - timeoutInMinutes: 180 + timeoutInMinutes: 300 # We need longer than the default amount of 5 minutes to upload our logs/artifacts. (We currently take around 5 mins in the best case). # This makes sure we have time to upload everything in the case of a build timeout - really important for investigating a build From 031c22ceb2ce11a589163ab192df4d5f52d95306 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 18 Oct 2019 10:01:41 -0700 Subject: [PATCH 079/116] Add samples/test assets --- eng/IndirectReferences.props | 6420 +++++++++++++++++++++++++--------- 1 file changed, 4688 insertions(+), 1732 deletions(-) diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props index 615a9e15f059..93c98ba550c1 100644 --- a/eng/IndirectReferences.props +++ b/eng/IndirectReferences.props @@ -1,12 +1,20 @@ - + + + <_RefsToCheck Include="@(Reference.Identity)" /> + <_RefsToCheck Include="@(ProjectReference.Filename)" /> + + + + + @@ -14,6 +22,7 @@ + @@ -23,21 +32,9 @@ - - - - - - - - - - - - - + - + @@ -48,6 +45,7 @@ + @@ -57,6 +55,7 @@ + @@ -65,7 +64,7 @@ - + @@ -75,6 +74,7 @@ + @@ -84,6 +84,7 @@ + @@ -92,21 +93,7 @@ - - - - - - - - - - - - - - - + @@ -116,231 +103,3526 @@ + - - - - - - - + + + + + + - + - + + + - + + - - - - - - - + + - + + + + - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - + + - - - - + + + + - - - - - - + + + + + - - - - + + - - - - - - - - - - - - + - - - - + + + - - - - - - - - - + + + + + - + - + + - - + + - + - + - + + - + - - + + + - + + - - + + + + - + + + - - - + + - + + - - - - - - + + - + + + - - - - - - + + - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + - + + - + + + - + - + + + - + + - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -355,6 +3637,7 @@ + @@ -366,152 +3649,96 @@ - + + - - - - - - - - - - - - - - - - - - - - - - - - + + + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - + + + + + + + - + + + @@ -519,338 +3746,289 @@ - + + + + + + + + + + - + + + + + + + - - + + + + - - + + + - - + + + + - + - - - + + - + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + - - - + + - + - + + - + + - - - - - - - + - - - - - - - - + - + - - - - + - - - - + - + - + - - - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - + - - - - + - - - - - - - - + + + + + - + - + + + - - - - - - - - - - - - - - - - - - + + + - - + - + - - - - - - - + - - - - - - + + + - - - + - + - + + + - + + + - + + @@ -859,260 +4037,294 @@ - + + + + + + + + + + + + + + + + - - + + + + - + - + - + + - - - + + + - + + - - + + + - - + + - - - + + - - - + + + + - - - + + - - - + + + - - - + + - - - + + + - + + + + + - - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - + - + - + + + + + + + + + + - + + + + + + - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - + + + + + - - - + - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - + - - - + + + - - + - + - - - - - @@ -1122,182 +4334,198 @@ - - + + - - - - + + + + + - - - + + + + - - + + - + + - + + - + + - + + + - + + + - - + + + - + - - - + - - + + - + - - - - + - + + + - - - - - - + + + - - + + + + - - - - - + + - - - - - - + + + + + - + - - + + + + + - + + + + - - - - - - + + + + + + - + + + - + - + - - - - - + + + + + + + + + + + + + + + + + - - + + - - - - - + + + - + - - - - - - - - + + - - - - + + + - + + - + + + @@ -1305,11 +4533,13 @@ + + @@ -1327,6 +4557,7 @@ + @@ -1334,14 +4565,63 @@ + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1350,28 +4630,36 @@ + + - + + + + + + + @@ -1386,6 +4674,7 @@ + @@ -1393,188 +4682,115 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - + - - - - + + + + - - - + - + - - - + + + + - - + + - - - - - - - - - - - - - - - - + + - + + + - - - - - - - - - - - - - - - + - - - - - + - - - - - + - + - - + + - + + + + - + - + - + - + - + - + - @@ -1582,7 +4798,9 @@ + + @@ -1590,11 +4808,13 @@ + + @@ -1612,6 +4832,7 @@ + @@ -1623,108 +4844,45 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + - - + - + - - + - + - - + - - + - - - + @@ -1734,166 +4892,152 @@ - + + - - - - - + + + + + + + + + - + - - + + + - + - - + - + + - + + - + - + - + - + + + + + + + + - + - - - - + + - + - - + + - - - - - + + + - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + + + + + - + - + + + + + - + + - + + @@ -1903,174 +5047,204 @@ - + + + - + + - - - - + + + + + + + + + + + + + + - + + + - - + + + - + + + + + + + + + + + - - - - - + + + - - + - - - + + + + + + + + + + + + + + - + - - + + + + + - - + - + + + + + - + + - + + + - - + + - + + + + - - + + + + - + + - + + + + - - - - - - - - - - - + + + + + + + - + + + - - - - - + - - - - + + + + + + + + + + + + + + + + + + - + + - + - - + + + - - - + + - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - + + - - - - - - + - - + @@ -2086,6 +5260,7 @@ + @@ -2093,256 +5268,226 @@ - - - + - - - - - - - - + + - - - - - - - - + - - - + + + - + - + + + + + + + - - - - + + - + + + + + + + - - - - - - - - - - - - - - - - + + - + + - - - - + + + - + + - - - - - + + + - - + + - + - + - - + + - - - - + + + + + - - - - + + + - - - + + + - - + - - + + + - - + - - - + + - + + - - - - + - - - + + - - - - - - + - + + - - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - + + + + - - - - + + + + + - + + + + + + + + - + + + + + + + + + + + + + + + + + + + @@ -2352,88 +5497,162 @@ + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - + + - + - + + + + + + - + + + + + + - - + + + + - + + + - + + + + - - + + + + + + + + + + + + + + + + + + @@ -2442,219 +5661,309 @@ + + + + + + + - + + + - - - - - - - - - - - - - - - + + + + + + + + + - - - - + + + - + + + + - - - - + + + + + + + + - - - - - - - - - - - - - - + + + - - + + + + + + + + + + + + + + - - - - + + - - + + + + + + + + + + + + + + + + + + + + + - - + + + - + + + + + - + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + - + + + + + + + + + - - - - - + + + - + + + - - - - + + - + - + + + + + - + + - - + - - - - - - - + + + + + + - - - + - - + + - + + + + + + + + + + + + - - + + + + + + + + + + - + + + + - - - - - - - - + + - - + - + + + @@ -2667,8 +5976,10 @@ + + @@ -2679,6 +5990,7 @@ + @@ -2686,6 +5998,7 @@ + @@ -2707,6 +6020,7 @@ + @@ -2720,18 +6034,19 @@ - + + - + @@ -2741,127 +6056,55 @@ + - + + - - + + + + + - + + + + - - + - - - - - - - - - - - - - - - + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - + - + @@ -2872,7 +6115,9 @@ + + @@ -2882,6 +6127,7 @@ + @@ -2913,68 +6159,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -2982,7 +6173,7 @@ - + @@ -2997,7 +6188,7 @@ - + @@ -3007,7 +6198,7 @@ - + @@ -3017,9 +6208,9 @@ - + - + @@ -3028,17 +6219,17 @@ - + - + - + - + @@ -3057,11 +6248,11 @@ - + - + - + @@ -3088,7 +6279,7 @@ - + @@ -3098,7 +6289,7 @@ - + @@ -3109,42 +6300,42 @@ - + - + - + - + - + - + - + - + - + @@ -3155,18 +6346,18 @@ - + - + - + - + @@ -3193,7 +6384,7 @@ - + @@ -3202,16 +6393,16 @@ - + - + - + - + - + @@ -3222,7 +6413,7 @@ - + @@ -3230,9 +6421,9 @@ - + - + @@ -3240,10 +6431,10 @@ - + - + @@ -3269,11 +6460,11 @@ - + - + @@ -3286,7 +6477,7 @@ - + @@ -3295,18 +6486,18 @@ - + - + - + @@ -3318,29 +6509,29 @@ - + - + - + - + - + - + - + @@ -3349,7 +6540,7 @@ - + @@ -3361,7 +6552,7 @@ - + @@ -3370,13 +6561,13 @@ - + - + - + @@ -3387,7 +6578,7 @@ - + @@ -3398,7 +6589,7 @@ - + @@ -3406,249 +6597,14 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From a6c81ea76e3c426cc27cfad1bc5ddcf4cf74f057 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 18 Oct 2019 10:52:49 -0700 Subject: [PATCH 080/116] Don't add indirect refs for ProjectRefs with ReferenceOutputAssembly=false --- eng/IndirectReferences.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props index 93c98ba550c1..d2ed42e328d5 100644 --- a/eng/IndirectReferences.props +++ b/eng/IndirectReferences.props @@ -2,7 +2,7 @@ <_RefsToCheck Include="@(Reference.Identity)" /> - <_RefsToCheck Include="@(ProjectReference.Filename)" /> + <_RefsToCheck Include="%(ProjectReference.Filename)" Condition="'%(ProjectReference.ReferenceOutputAssembly)' != 'false'" /> From ed8e20c7ba2c5c76616b72f953f37ad70b10e622 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 18 Oct 2019 10:57:58 -0700 Subject: [PATCH 081/116] Fix item resolution --- eng/IndirectReferences.props | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props index d2ed42e328d5..4f257a7862ec 100644 --- a/eng/IndirectReferences.props +++ b/eng/IndirectReferences.props @@ -2,7 +2,8 @@ <_RefsToCheck Include="@(Reference.Identity)" /> - <_RefsToCheck Include="%(ProjectReference.Filename)" Condition="'%(ProjectReference.ReferenceOutputAssembly)' != 'false'" /> + <_ProjectRefsToCheck Include="@(ProjectReference)" Exclude="@(ProjectReference->WithMetadataValue('ReferenceOutputAssembly', 'false'))" /> + <_RefsToCheck Include="%(_ProjectRefsToCheck.Filename)"/> From 7edfa0f669eaa20d383adebf7a917396d8743030 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 18 Oct 2019 11:02:38 -0700 Subject: [PATCH 082/116] Fix item resolution again --- eng/IndirectReferences.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props index 4f257a7862ec..b5eba79e4847 100644 --- a/eng/IndirectReferences.props +++ b/eng/IndirectReferences.props @@ -3,7 +3,7 @@ <_RefsToCheck Include="@(Reference.Identity)" /> <_ProjectRefsToCheck Include="@(ProjectReference)" Exclude="@(ProjectReference->WithMetadataValue('ReferenceOutputAssembly', 'false'))" /> - <_RefsToCheck Include="%(_ProjectRefsToCheck.Filename)"/> + <_RefsToCheck Include="@(_ProjectRefsToCheck->'%(Filename)')"/> From 62dfd65a886d3b8d3fb8d77f40db3525d502e754 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 18 Oct 2019 11:04:32 -0700 Subject: [PATCH 083/116] Fix item resolution again --- eng/IndirectReferences.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props index b5eba79e4847..a7d3b0969649 100644 --- a/eng/IndirectReferences.props +++ b/eng/IndirectReferences.props @@ -1,7 +1,7 @@ - <_RefsToCheck Include="@(Reference.Identity)" /> + <_RefsToCheck Include="@(Reference->'%(Identity)')"/> <_ProjectRefsToCheck Include="@(ProjectReference)" Exclude="@(ProjectReference->WithMetadataValue('ReferenceOutputAssembly', 'false'))" /> <_RefsToCheck Include="@(_ProjectRefsToCheck->'%(Filename)')"/> From 570f61fbf317bc7da1b919bedb7e67f8eeff28e7 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 18 Oct 2019 11:14:44 -0700 Subject: [PATCH 084/116] Revert logic from last change --- eng/IndirectReferences.props | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props index a7d3b0969649..f34d16e08baa 100644 --- a/eng/IndirectReferences.props +++ b/eng/IndirectReferences.props @@ -2,8 +2,7 @@ <_RefsToCheck Include="@(Reference->'%(Identity)')"/> - <_ProjectRefsToCheck Include="@(ProjectReference)" Exclude="@(ProjectReference->WithMetadataValue('ReferenceOutputAssembly', 'false'))" /> - <_RefsToCheck Include="@(_ProjectRefsToCheck->'%(Filename)')"/> + <_RefsToCheck Include="@(ProjectReference->'%(Filename)')"/> From 3dbc6d3a6972ba50f3dbc95359a8ee81d8c79ca8 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 18 Oct 2019 11:23:31 -0700 Subject: [PATCH 085/116] Manual fixup to remove bad refs --- eng/IndirectReferences.props | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props index f34d16e08baa..29d4a9b85448 100644 --- a/eng/IndirectReferences.props +++ b/eng/IndirectReferences.props @@ -2,6 +2,7 @@ <_RefsToCheck Include="@(Reference->'%(Identity)')"/> + <_ProjectRefsToCheck Include="@(ProjectReference)" Exclude="@(ProjectReference->WithMetadataValue('ReferenceOutputAssembly', 'false'))" /> <_RefsToCheck Include="@(ProjectReference->'%(Filename)')"/> @@ -1186,7 +1187,6 @@ - @@ -1532,7 +1532,6 @@ - @@ -1920,7 +1919,6 @@ - @@ -1992,7 +1990,6 @@ - @@ -2185,7 +2182,6 @@ - @@ -3475,7 +3471,6 @@ - @@ -3779,7 +3774,6 @@ - From 824018844e05690f5cebabea9f8c291dc6e286f7 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 18 Oct 2019 12:05:38 -0700 Subject: [PATCH 086/116] More manual fixup --- eng/IndirectReferences.props | 3 --- 1 file changed, 3 deletions(-) diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props index 29d4a9b85448..4f446ed9ee5c 100644 --- a/eng/IndirectReferences.props +++ b/eng/IndirectReferences.props @@ -1263,7 +1263,6 @@ - @@ -1564,7 +1563,6 @@ - @@ -3487,7 +3485,6 @@ - From 8f9141e8039e549c740d85db574accd5e4a73be6 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 18 Oct 2019 12:23:56 -0700 Subject: [PATCH 087/116] Fix version.details.xml --- eng/Version.Details.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2978ddd86a69..d19802362ad0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -273,6 +273,10 @@ https://github.com/aspnet/Extensions 40c00020ac632006c9db91383de246226f9cb44a + + https://github.com/aspnet/Extensions + 40c00020ac632006c9db91383de246226f9cb44a + https://github.com/aspnet/Extensions 40c00020ac632006c9db91383de246226f9cb44a From e829b59fe16a989f170a3e4cb63a658961118654 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 18 Oct 2019 12:24:21 -0700 Subject: [PATCH 088/116] Alphabetize --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d19802362ad0..1ce977ca9fc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -273,11 +273,11 @@ https://github.com/aspnet/Extensions 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions 40c00020ac632006c9db91383de246226f9cb44a From f59a0910a33a312b863d07b65378e83ae3c47239 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 18 Oct 2019 12:49:21 -0700 Subject: [PATCH 089/116] Remove .sources files --- eng/IndirectReferences.props | 399 ----------------------------------- 1 file changed, 399 deletions(-) diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props index 4f446ed9ee5c..818226858f73 100644 --- a/eng/IndirectReferences.props +++ b/eng/IndirectReferences.props @@ -13,9 +13,7 @@ - - @@ -23,7 +21,6 @@ - @@ -46,7 +43,6 @@ - @@ -56,7 +52,6 @@ - @@ -75,7 +70,6 @@ - @@ -85,7 +79,6 @@ - @@ -104,7 +97,6 @@ - @@ -121,9 +113,7 @@ - - @@ -135,7 +125,6 @@ - @@ -186,9 +175,7 @@ - - @@ -199,7 +186,6 @@ - @@ -248,9 +234,7 @@ - - @@ -262,7 +246,6 @@ - @@ -314,7 +297,6 @@ - @@ -336,11 +318,9 @@ - - @@ -357,7 +337,6 @@ - @@ -382,9 +361,7 @@ - - @@ -432,7 +409,6 @@ - @@ -445,7 +421,6 @@ - @@ -458,7 +433,6 @@ - @@ -476,9 +450,7 @@ - - @@ -495,25 +467,20 @@ - - - - - @@ -529,25 +496,20 @@ - - - - - @@ -570,7 +532,6 @@ - @@ -587,9 +548,7 @@ - - @@ -597,13 +556,11 @@ - - @@ -645,7 +602,6 @@ - @@ -656,7 +612,6 @@ - @@ -680,7 +635,6 @@ - @@ -692,7 +646,6 @@ - @@ -722,9 +675,7 @@ - - @@ -737,7 +688,6 @@ - @@ -767,10 +717,8 @@ - - @@ -781,7 +729,6 @@ - @@ -789,7 +736,6 @@ - @@ -811,7 +757,6 @@ - @@ -841,9 +786,7 @@ - - @@ -856,7 +799,6 @@ - @@ -888,10 +830,8 @@ - - @@ -907,7 +847,6 @@ - @@ -916,7 +855,6 @@ - @@ -946,7 +884,6 @@ - @@ -968,7 +905,6 @@ - @@ -990,7 +926,6 @@ - @@ -1016,10 +951,8 @@ - - @@ -1031,7 +964,6 @@ - @@ -1039,7 +971,6 @@ - @@ -1064,7 +995,6 @@ - @@ -1090,9 +1020,7 @@ - - @@ -1103,7 +1031,6 @@ - @@ -1149,7 +1076,6 @@ - @@ -1174,11 +1100,9 @@ - - @@ -1197,7 +1121,6 @@ - @@ -1224,9 +1147,7 @@ - - @@ -1285,12 +1206,10 @@ - - @@ -1311,7 +1230,6 @@ - @@ -1336,9 +1254,7 @@ - - @@ -1384,7 +1300,6 @@ - @@ -1399,7 +1314,6 @@ - @@ -1419,7 +1333,6 @@ - @@ -1439,7 +1352,6 @@ - @@ -1450,7 +1362,6 @@ - @@ -1479,7 +1390,6 @@ - @@ -1494,7 +1404,6 @@ - @@ -1510,10 +1419,8 @@ - - @@ -1542,7 +1449,6 @@ - @@ -1554,7 +1460,6 @@ - @@ -1578,7 +1483,6 @@ - @@ -1588,7 +1492,6 @@ - @@ -1617,7 +1520,6 @@ - @@ -1638,9 +1540,7 @@ - - @@ -1652,7 +1552,6 @@ - @@ -1697,10 +1596,8 @@ - - @@ -1724,10 +1621,8 @@ - - @@ -1743,7 +1638,6 @@ - @@ -1752,7 +1646,6 @@ - @@ -1785,7 +1678,6 @@ - @@ -1831,7 +1723,6 @@ - @@ -1845,7 +1736,6 @@ - @@ -1874,11 +1764,9 @@ - - @@ -1897,7 +1785,6 @@ - @@ -1924,9 +1811,7 @@ - - @@ -1968,7 +1853,6 @@ - @@ -1984,12 +1868,10 @@ - - @@ -2010,12 +1892,10 @@ - - @@ -2032,7 +1912,6 @@ - @@ -2057,9 +1936,7 @@ - - @@ -2114,25 +1991,20 @@ - - - - - @@ -2153,7 +2025,6 @@ - @@ -2167,7 +2038,6 @@ - @@ -2187,7 +2057,6 @@ - @@ -2197,7 +2066,6 @@ - @@ -2253,7 +2121,6 @@ - @@ -2270,7 +2137,6 @@ - @@ -2286,25 +2152,20 @@ - - - - - @@ -2326,7 +2187,6 @@ - @@ -2335,7 +2195,6 @@ - @@ -2347,9 +2206,7 @@ - - @@ -2357,13 +2214,11 @@ - - @@ -2381,7 +2236,6 @@ - @@ -2407,9 +2261,7 @@ - - @@ -2420,7 +2272,6 @@ - @@ -2459,7 +2310,6 @@ - @@ -2494,10 +2344,8 @@ - - @@ -2508,7 +2356,6 @@ - @@ -2516,7 +2363,6 @@ - @@ -2540,7 +2386,6 @@ - @@ -2576,7 +2421,6 @@ - @@ -2600,7 +2444,6 @@ - @@ -2611,7 +2454,6 @@ - @@ -2625,7 +2467,6 @@ - @@ -2644,9 +2485,7 @@ - - @@ -2671,9 +2510,7 @@ - - @@ -2689,7 +2526,6 @@ - @@ -2730,9 +2566,7 @@ - - @@ -2742,7 +2576,6 @@ - @@ -2750,7 +2583,6 @@ - @@ -2801,7 +2633,6 @@ - @@ -2832,13 +2663,11 @@ - - @@ -2859,7 +2688,6 @@ - @@ -2890,9 +2718,7 @@ - - @@ -2950,10 +2776,8 @@ - - @@ -2963,14 +2787,12 @@ - - @@ -2988,7 +2810,6 @@ - @@ -3027,7 +2848,6 @@ - @@ -3035,7 +2855,6 @@ - @@ -3056,9 +2875,7 @@ - - @@ -3070,7 +2887,6 @@ - @@ -3079,7 +2895,6 @@ - @@ -3102,7 +2917,6 @@ - @@ -3132,10 +2946,8 @@ - - @@ -3154,7 +2966,6 @@ - @@ -3174,9 +2985,7 @@ - - @@ -3186,7 +2995,6 @@ - @@ -3238,9 +3046,7 @@ - - @@ -3254,7 +3060,6 @@ - @@ -3286,11 +3091,9 @@ - - @@ -3309,7 +3112,6 @@ - @@ -3331,9 +3133,7 @@ - - @@ -3368,7 +3168,6 @@ - @@ -3381,31 +3180,25 @@ - - - - - - @@ -3414,7 +3207,6 @@ - @@ -3426,7 +3218,6 @@ - @@ -3443,7 +3234,6 @@ - @@ -3474,7 +3264,6 @@ - @@ -3489,7 +3278,6 @@ - @@ -3498,7 +3286,6 @@ - @@ -3509,7 +3296,6 @@ - @@ -3527,7 +3313,6 @@ - @@ -3548,7 +3333,6 @@ - @@ -3572,7 +3356,6 @@ - @@ -3594,9 +3377,7 @@ - - @@ -3604,14 +3385,12 @@ - - @@ -3629,7 +3408,6 @@ - @@ -3643,7 +3421,6 @@ - @@ -3657,14 +3434,11 @@ - - - @@ -3689,10 +3463,8 @@ - - @@ -3708,7 +3480,6 @@ - @@ -3716,7 +3487,6 @@ - @@ -3746,7 +3516,6 @@ - @@ -3767,7 +3536,6 @@ - @@ -3779,22 +3547,18 @@ - - - - @@ -3811,7 +3575,6 @@ - @@ -3841,7 +3604,6 @@ - @@ -3854,7 +3616,6 @@ - @@ -3869,7 +3630,6 @@ - @@ -3884,7 +3644,6 @@ - @@ -3902,9 +3661,7 @@ - - @@ -3916,7 +3673,6 @@ - @@ -3958,7 +3714,6 @@ - @@ -3969,7 +3724,6 @@ - @@ -4006,7 +3760,6 @@ - @@ -4017,7 +3770,6 @@ - @@ -4032,7 +3784,6 @@ - @@ -4041,7 +3792,6 @@ - @@ -4054,9 +3804,7 @@ - - @@ -4066,7 +3814,6 @@ - @@ -4102,7 +3849,6 @@ - @@ -4113,7 +3859,6 @@ - @@ -4133,9 +3878,7 @@ - - @@ -4147,7 +3890,6 @@ - @@ -4189,14 +3931,11 @@ - - - @@ -4216,13 +3955,10 @@ - - - @@ -4231,7 +3967,6 @@ - @@ -4239,7 +3974,6 @@ - @@ -4265,7 +3999,6 @@ - @@ -4279,7 +4012,6 @@ - @@ -4292,9 +4024,7 @@ - - @@ -4303,13 +4033,11 @@ - - @@ -4327,7 +4055,6 @@ - @@ -4359,9 +4086,7 @@ - - @@ -4374,7 +4099,6 @@ - @@ -4419,14 +4143,11 @@ - - - @@ -4444,9 +4165,7 @@ - - @@ -4464,9 +4183,7 @@ - - @@ -4474,7 +4191,6 @@ - @@ -4514,9 +4230,7 @@ - - @@ -4524,13 +4238,11 @@ - - @@ -4548,7 +4260,6 @@ - @@ -4578,7 +4289,6 @@ - @@ -4604,7 +4314,6 @@ - @@ -4621,9 +4330,7 @@ - - @@ -4633,14 +4340,12 @@ - - @@ -4665,7 +4370,6 @@ - @@ -4692,9 +4396,7 @@ - - @@ -4708,7 +4410,6 @@ - @@ -4724,9 +4425,7 @@ - - @@ -4743,7 +4442,6 @@ - @@ -4760,7 +4458,6 @@ - @@ -4789,9 +4486,7 @@ - - @@ -4799,13 +4494,11 @@ - - @@ -4823,7 +4516,6 @@ - @@ -4847,9 +4539,7 @@ - - @@ -4858,14 +4548,12 @@ - - @@ -4887,7 +4575,6 @@ - @@ -4922,7 +4609,6 @@ - @@ -4933,7 +4619,6 @@ - @@ -4954,18 +4639,15 @@ - - - @@ -4992,10 +4674,8 @@ - - @@ -5007,7 +4687,6 @@ - @@ -5015,7 +4694,6 @@ - @@ -5043,7 +4721,6 @@ - @@ -5070,9 +4747,7 @@ - - @@ -5082,13 +4757,11 @@ - - @@ -5104,9 +4777,7 @@ - - @@ -5117,7 +4788,6 @@ - @@ -5134,10 +4804,8 @@ - - @@ -5148,7 +4816,6 @@ - @@ -5158,7 +4825,6 @@ - @@ -5183,7 +4849,6 @@ - @@ -5201,7 +4866,6 @@ - @@ -5215,7 +4879,6 @@ - @@ -5251,7 +4914,6 @@ - @@ -5263,8 +4925,6 @@ - - @@ -5272,7 +4932,6 @@ - @@ -5296,7 +4955,6 @@ - @@ -5313,7 +4971,6 @@ - @@ -5339,9 +4996,7 @@ - - @@ -5350,7 +5005,6 @@ - @@ -5395,9 +5049,7 @@ - - @@ -5412,7 +5064,6 @@ - @@ -5436,10 +5087,8 @@ - - @@ -5452,7 +5101,6 @@ - @@ -5461,7 +5109,6 @@ - @@ -5493,7 +5140,6 @@ - @@ -5530,8 +5176,6 @@ - - @@ -5556,7 +5200,6 @@ - @@ -5580,7 +5223,6 @@ - @@ -5604,10 +5246,8 @@ - - @@ -5620,7 +5260,6 @@ - @@ -5629,7 +5268,6 @@ - @@ -5662,7 +5300,6 @@ - @@ -5696,7 +5333,6 @@ - @@ -5707,7 +5343,6 @@ - @@ -5731,25 +5366,20 @@ - - - - - @@ -5773,9 +5403,7 @@ - - @@ -5789,7 +5417,6 @@ - @@ -5817,9 +5444,7 @@ - - @@ -5829,14 +5454,12 @@ - - @@ -5859,7 +5482,6 @@ - @@ -5882,7 +5504,6 @@ - @@ -5894,21 +5515,17 @@ - - - - @@ -5925,7 +5542,6 @@ - @@ -5937,7 +5553,6 @@ - @@ -5945,7 +5560,6 @@ - @@ -5967,10 +5581,8 @@ - - @@ -5981,7 +5593,6 @@ - @@ -5989,7 +5600,6 @@ - @@ -6011,7 +5621,6 @@ - @@ -6031,7 +5640,6 @@ - @@ -6047,7 +5655,6 @@ - @@ -6055,7 +5662,6 @@ - @@ -6089,7 +5695,6 @@ - @@ -6106,9 +5711,7 @@ - - @@ -6118,7 +5721,6 @@ - @@ -6156,7 +5758,6 @@ - From 6fa28160f2840204ed1bb9e2003a224522492c02 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 18 Oct 2019 13:38:03 -0700 Subject: [PATCH 090/116] Add JSInterop --- eng/IndirectReferences.props | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props index 818226858f73..7dafcaff4ef5 100644 --- a/eng/IndirectReferences.props +++ b/eng/IndirectReferences.props @@ -2169,6 +2169,7 @@ + @@ -3701,6 +3702,7 @@ + From 12e161814711e1af094e63f49b77c247824e9b7f Mon Sep 17 00:00:00 2001 From: John Luo Date: Fri, 18 Oct 2019 18:14:48 -0700 Subject: [PATCH 091/116] Disable the TestFramework assembly attribute from Logging.Testing There's custom logic in ProjectTemplates.Tests to use a different TestFramework instead --- src/ProjectTemplates/test/ProjectTemplates.Tests.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj index 7b26d044d2b7..2e7d562230ca 100644 --- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj +++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj @@ -22,6 +22,7 @@ TestTemplates\ $([MSBuild]::EnsureTrailingSlash('$(RepoRoot)'))obj\template-restore\ TemplateTests.props + false @@ -62,7 +63,7 @@ <_Parameter2>true - + $([MSBuild]::NormalizePath('$(OutputPath)$(TestTemplateCreationFolder)')) From c8f256743732abbb1b83a4a891c2b65cb5cee7f9 Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 21 Oct 2019 18:21:08 -0700 Subject: [PATCH 092/116] Fix Functional Tests 1 --- src/DefaultBuilder/testassets/Directory.Build.props | 7 +++++++ .../IStartupInjectionAssemblyName.csproj | 5 +++++ src/Mvc/test/WebSites/Directory.Build.props | 7 +++++++ .../ServerComparison.TestSites.csproj | 5 +++++ 4 files changed, 24 insertions(+) diff --git a/src/DefaultBuilder/testassets/Directory.Build.props b/src/DefaultBuilder/testassets/Directory.Build.props index b49282fb6f94..b8ad72d258a1 100644 --- a/src/DefaultBuilder/testassets/Directory.Build.props +++ b/src/DefaultBuilder/testassets/Directory.Build.props @@ -6,4 +6,11 @@ + + + + + diff --git a/src/Hosting/test/testassets/IStartupInjectionAssemblyName/IStartupInjectionAssemblyName.csproj b/src/Hosting/test/testassets/IStartupInjectionAssemblyName/IStartupInjectionAssemblyName.csproj index 3ea37b679b61..da860f1783a0 100644 --- a/src/Hosting/test/testassets/IStartupInjectionAssemblyName/IStartupInjectionAssemblyName.csproj +++ b/src/Hosting/test/testassets/IStartupInjectionAssemblyName/IStartupInjectionAssemblyName.csproj @@ -6,6 +6,11 @@ + + + diff --git a/src/Mvc/test/WebSites/Directory.Build.props b/src/Mvc/test/WebSites/Directory.Build.props index 16d5bfcfea26..74f5a5de5a5f 100644 --- a/src/Mvc/test/WebSites/Directory.Build.props +++ b/src/Mvc/test/WebSites/Directory.Build.props @@ -4,4 +4,11 @@ + + + + + diff --git a/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj b/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj index eb8d5f9d98d2..25f206d9c5a1 100644 --- a/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj +++ b/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj @@ -9,6 +9,11 @@ + + + From f7eadb49880ad268b2739ca5775a43b94d041285 Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 21 Oct 2019 22:51:30 -0700 Subject: [PATCH 093/116] Fix Functional Tests 2 --- .../test/Infrastructure/Directory.Build.props.in | 7 +++++++ .../Identity.ExternalClaims/Identity.ExternalClaims.csproj | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/src/ProjectTemplates/test/Infrastructure/Directory.Build.props.in b/src/ProjectTemplates/test/Infrastructure/Directory.Build.props.in index 6186fc2f15a1..51c397828ce2 100644 --- a/src/ProjectTemplates/test/Infrastructure/Directory.Build.props.in +++ b/src/ProjectTemplates/test/Infrastructure/Directory.Build.props.in @@ -1,3 +1,10 @@ + + + + + diff --git a/src/Security/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj b/src/Security/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj index fc5f7fded59c..d90cf851f241 100644 --- a/src/Security/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj +++ b/src/Security/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj @@ -5,6 +5,11 @@ true + + + From 0d062c83aced5f6e82846c2486de1ebdd84f85dd Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 22 Oct 2019 01:23:02 -0700 Subject: [PATCH 094/116] Fix Template Test 1 --- .../HealthChecksSample/HealthChecksSample.csproj | 5 +++++ .../test/Infrastructure/Directory.Build.props.in | 7 +------ src/ProjectTemplates/test/ProjectTemplates.Tests.csproj | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Middleware/HealthChecks/test/testassets/HealthChecksSample/HealthChecksSample.csproj b/src/Middleware/HealthChecks/test/testassets/HealthChecksSample/HealthChecksSample.csproj index d41b7835391c..c471797b20e6 100644 --- a/src/Middleware/HealthChecks/test/testassets/HealthChecksSample/HealthChecksSample.csproj +++ b/src/Middleware/HealthChecks/test/testassets/HealthChecksSample/HealthChecksSample.csproj @@ -5,6 +5,11 @@ + + + diff --git a/src/ProjectTemplates/test/Infrastructure/Directory.Build.props.in b/src/ProjectTemplates/test/Infrastructure/Directory.Build.props.in index 51c397828ce2..496a3a1179bc 100644 --- a/src/ProjectTemplates/test/Infrastructure/Directory.Build.props.in +++ b/src/ProjectTemplates/test/Infrastructure/Directory.Build.props.in @@ -1,10 +1,5 @@ - - - - + diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj index 2e7d562230ca..729b912cc7ea 100644 --- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj +++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj @@ -128,7 +128,7 @@ From 7a3737b4a5f388a6eb89faa59b5b7c7a6f1cba1d Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 22 Oct 2019 02:17:32 -0700 Subject: [PATCH 095/116] Try again --- .../Identity.ExternalClaims/Identity.ExternalClaims.csproj | 5 ----- .../AuthSamples.FunctionalTests.csproj | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Security/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj b/src/Security/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj index d90cf851f241..fc5f7fded59c 100644 --- a/src/Security/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj +++ b/src/Security/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj @@ -5,11 +5,6 @@ true - - - diff --git a/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj b/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj index 701317f7456b..d901794c4a72 100644 --- a/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj +++ b/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj @@ -22,6 +22,11 @@ + + + From ce36199036e323dacb9636caf430aeeaf8330c61 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 22 Oct 2019 12:30:09 -0700 Subject: [PATCH 096/116] Experimental fix for blazor e2e tests --- src/Components/Blazor/testassets/Directory.Build.props | 10 ++++++++++ src/Components/test/testassets/Directory.Build.props | 10 ++++++++++ 2 files changed, 20 insertions(+) create mode 100644 src/Components/Blazor/testassets/Directory.Build.props create mode 100644 src/Components/test/testassets/Directory.Build.props diff --git a/src/Components/Blazor/testassets/Directory.Build.props b/src/Components/Blazor/testassets/Directory.Build.props new file mode 100644 index 000000000000..938199f96ec5 --- /dev/null +++ b/src/Components/Blazor/testassets/Directory.Build.props @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/src/Components/test/testassets/Directory.Build.props b/src/Components/test/testassets/Directory.Build.props new file mode 100644 index 000000000000..938199f96ec5 --- /dev/null +++ b/src/Components/test/testassets/Directory.Build.props @@ -0,0 +1,10 @@ + + + + + + + + From 13b39ef846530c8569c9346c4815e92a0c1f8cab Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 22 Oct 2019 14:21:07 -0700 Subject: [PATCH 097/116] Add missed samples, test asset files to IndirectRefs.props --- eng/IndirectReferences.props | 9324 +++++++++++++++++++++++++--------- 1 file changed, 7031 insertions(+), 2293 deletions(-) diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props index 7dafcaff4ef5..1dd68a0a6294 100644 --- a/eng/IndirectReferences.props +++ b/eng/IndirectReferences.props @@ -6,28 +6,62 @@ <_RefsToCheck Include="@(ProjectReference->'%(Filename)')"/> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -87,19 +121,118 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -302,14 +435,26 @@ - - + + + + + + + + + + + + + + @@ -318,83 +463,158 @@ + + + + + + + + + + + + + + + + + - + + + - + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -514,167 +734,95 @@ - - - + - - - - - + + + - - - + + + - + + + - + + + - + - - - + - - - - - - - - - - - - - + + - + + + + + - + + + - + + - - - + + + + + + - + + - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - @@ -683,28 +831,20 @@ - - + - - - - - - - - + @@ -721,7 +861,6 @@ - @@ -729,7 +868,6 @@ - @@ -738,11 +876,9 @@ - - @@ -752,7 +888,6 @@ - @@ -770,22 +905,23 @@ - + + + - + - - - + + @@ -794,176 +930,246 @@ - - + - - - - + - + - - - - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + - - + + - - - + - - + + + - - - + - - - + + - - + + + - - - + + - - + - - + - - + + + + - + - - - - + + - - + - + + + - - - - + + + + - - - + + + + - - - - - + - + + - + + + + + + + + + + + + + + - + - + + + - - + + + + + - - - - - + - - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - - + + + + + - - - + + + + @@ -976,12 +1182,15 @@ + - + + + @@ -991,378 +1200,299 @@ + + + + - - + + + - + - + + + + + + + + + + + + - + + + + + + - + + + - + + + - + - + - - - - + + + - - + + + + + - + + + + + + + + + + + + + - + + + + + + - - + + + + + + + + - + - - - + + - - + + - - - - - - - - - - - - - - - - + + + + + + - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + - - + + + - - - - + + + + - + + + + - + + - - - + + + + + + + - - + + + + - - + - + + - - + + + - + + - + - - + + - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - + - + + + + - + + + - + @@ -1371,14 +1501,13 @@ - + + - - @@ -1386,226 +1515,244 @@ - + - - - + - + - + + - - - - - - - - - - - - - - - + - - - + + + - - + + - - - + - + - + + + - - - + + - + + + + - + + + - + + + + - + - + - + + + - - - + + + - - - + + + + + + - + + - - + + - + + - - - - - - - + + + + + + + + + + + + - + - + - - + - - - - - - - - - + + - + + + + + + + + + + + + - - - + + + - + - - + + + - - - + + + + - + - + - - + + - - - + - + + - - - + + - + - - + + + + + - + - - - + - - + - - - + + + + - + + + + + - + + + - - + + + + + + + + - - + - + - + - @@ -1613,7 +1760,6 @@ - @@ -1623,22 +1769,17 @@ - - - - - @@ -1649,18 +1790,14 @@ - - + - - - + - @@ -1668,27 +1805,21 @@ - - - - - + - - + - @@ -1696,67 +1827,96 @@ - - + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - + - - - - - + - - + + + + + + + + + + + - - - - - + + - - - - - - + + + + - + + + + - - + + + + + + - + + + + + - + + + @@ -1764,123 +1924,191 @@ + + + + + + + - + + + - - + + + - + + - + - + + - + + + - - + - + + + + + - - + + + - + - + + - - - + + + + + + + + - + + + + - - + - + + - + + - + + + - + + - + + + + + - - - - - - + + + - - + + + + + + + + + + + + + + + + + + + + - - + - - - - + + + - - + + + + + + + + + + + + + + - - - + + + + + + + + + - + + + @@ -1891,45 +2119,52 @@ + + - + + + - - + + + + - - + + + - + @@ -1940,16 +2175,14 @@ - + - - - + @@ -1958,389 +2191,296 @@ - + + - + - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - - - - + + + - + + - - - - - + + + - + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + - + + + + + + - - - + + - - - - - - - + + + + - + + - - - - + + + - - + + - + + + + + - + - - - + + - + + + + + - - - - - - - - - - - - - - + - - - - - + + + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + + - + - + + - + + - - + + + + - - - + + - + + + - - - - + + - - - - - - + - + + + + - + + + + - + + + - + - + + - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + @@ -2349,31 +2489,33 @@ - + - + + + - + - + @@ -2383,56 +2525,69 @@ - + - + + - - + + + - + - - - + - - - + + - - - + + + + + + + + + + + + + + + + + - + @@ -2449,13 +2604,12 @@ - - + @@ -2465,50 +2619,22 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + - - + @@ -2517,260 +2643,4209 @@ + - - - + - + - - + + - + - - - - - - - - - - - - - - - + - - + + - + + - - - - + - + - + - + - + + - - - - - + - - - - - - - - - - + - - - - + + + + + - - + + + - + + + + - - - - - + + + + + - + - + + + + + + - + - + + + - - + + + - - + + + + + + + - + - + + + + + + + + - - - + + - + + + + + - - - - - - - + + + + - + + - - - + + - - - + + + + + - - + + + - - - + + - + + - - - - - - - + + + + + + + + + + - - + + + + + - - - + + + + + - + + + + - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2781,25 +6856,34 @@ + - + + + + + + + + + @@ -2810,6 +6894,8 @@ + + @@ -2817,115 +6903,299 @@ + + - + + + + + + + - - - + + + + - + + - + + + - + + + + - - + + + + + + - + + + + + + + + + + + + + + + + + + + - - + + - + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + - + + + + + + + + + + + + - + - - - - - + - + - - - - + + + + + + - - - - - + + + + + - - + + + + + + + + + + + + + + + + - + + - - - + + + - + - + + + + + + + + + + + + + + + + + + + - - + - + + - + + + + + + + + + + + + - - + @@ -2937,246 +7207,334 @@ - - - - - + + + + + + + + - - - + + - + + - - - - + + - - - + + - + + - - - - - - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + - + + - - + + + + - - - + + + + - + + + - - - - + + - - + - + + + + - + - + - - - + + + + + + + + - - - + + + + + + + + + + + + + + + + + + - + - + + + + + + - - + + - + - - - + + + + + + + - - - + + - - + + + + + + - - + + + + - - + + + + - + + + + + + + + + + + + + + + @@ -3185,193 +7543,145 @@ + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + - - - + - + + - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + - + + + - - + + + - - - - - - - - - + + + + + - + + + - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - + + - - - - - - - + + + + + + + + + + + + + + + - + - + @@ -3379,6 +7689,7 @@ + @@ -3390,7 +7701,6 @@ - @@ -3409,6 +7719,7 @@ + @@ -3420,88 +7731,188 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - + + + + + + + + + + + + + + - + - + + - + - - + + - - + + - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - @@ -3511,61 +7922,72 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3573,386 +7995,382 @@ + + + + + + + + + + - - - + + + + - - + + + - - - - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + + + + + + - - - + - + - + + + + - + - + + + + + - + + + + - - + + + + + + - - + + + + + + + + - - + - - + + + + + - - - - + - + + - - - + - + - - - + + + - - - - - - - - - - - - - + - + + - - - - - + + - - - - + - - - + + + - + - - - - + - - - + + + + + + + + + + - - - - + + + + + + + + - + + + + + - + + + + - + + + - + + - + + + - + + + + + - + + + + + + - + - + - - + + + - + + + + + - + + + + + + + + + + + + - - + + + + + + + - - - - + + - + + + - - + - - + + - - - + - + + + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - + + - + + + + @@ -3961,17 +8379,20 @@ + - + + + @@ -3985,53 +8406,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + @@ -4039,13 +8431,16 @@ + + + @@ -4055,67 +8450,171 @@ + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + - + + + + + + + + + + + + - + + + + + + + + + + + + + @@ -4124,133 +8623,232 @@ + + + + + + - - - - + + + + + + - - - + + - + - - - - - + + - + + - - - - - - - - + + + - - - - + - - + + + + + + - + + + + + + + - + + + + + + + + + + + + + + + + + + - + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + @@ -4260,79 +8858,94 @@ + + + + + + - - - - + + - - - + + - + + + - - - - - + - - - - + - - - - - - - - - + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + - + + + - - - + + + @@ -4341,7 +8954,6 @@ - @@ -4350,15 +8962,11 @@ - - + - - - @@ -4368,299 +8976,254 @@ - - + - - + - - - + + - + + + + + + + - + + + + + + - + + - + + + - - + + + + + + + + - - - + + + - - + - - - - - + - - + + + + + + + - + - + + + + + + + + - + + + + + + - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + + + + - - - + - - + - - + - + - - + + - + - + + + - - - - - - + - - - + + - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - + - + + - - + + - + - - - + + + + + - + + @@ -4671,7 +9234,6 @@ - @@ -4686,6 +9248,7 @@ + @@ -4695,19 +9258,24 @@ + + + + + @@ -4719,6 +9287,7 @@ + @@ -4727,81 +9296,182 @@ + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + - + + - + + + + - - + + + - + + - + + + + + + - + + + - + + - + + + + + - - - + + - + @@ -4814,30 +9484,35 @@ + + - - + + + + + - - + + @@ -4845,115 +9520,82 @@ + - + + + + + - + - + - - - + + + - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + + + + + + + + + + + + + + + - + - - - + @@ -4962,34 +9604,74 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -5004,27 +9686,32 @@ + + + - + + - + + @@ -5033,100 +9720,99 @@ + + - + + + - - + + + + + + - + + + + + + + + - - + + + - + + + + - - + - - - - - + - + - - - - - - - - - - - - - - - @@ -5140,110 +9826,151 @@ - - - - - - - - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + + + + - - + - - - - - + + + - + - - - - + + - + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - - - + + + - + + - - - - - + + - + - + - - - @@ -5256,35 +9983,26 @@ - - - - - - - - - @@ -5295,45 +10013,64 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - + - @@ -5342,243 +10079,311 @@ + + + + + + - - + - - + + + - - - - - - + + + + + + + + + - - - - - + + + + - - - + + + + + + + - - + + + + - + + + + + + + + + + + + + + - + - - + - - - - + - - - - - + - - - - + + - - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - - + - + - - - - + + + - - - + + - - - + + - - - - - - + + - - + - - - - - - - - - - - + - - - - - + - + - + + + + + - + - + - - + + + - + - + + + - - + + - - - + + - - - + + + + + - + + - - - + + + - - - - - - - - - - - - - - - - - - + + + + @@ -5587,30 +10392,34 @@ - + - + + + - + - + + + @@ -5618,68 +10427,59 @@ - + + + + + + - - - - - - - - - - - - - + + - - - - + + - - - - - - + - + + + + - + + @@ -5687,85 +10487,23 @@ - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - + - + From e284b2885c9c4ab79e7c7801e8e7a5fbc0d622cf Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 22 Oct 2019 14:34:17 -0700 Subject: [PATCH 098/116] Remove web.js --- eng/IndirectReferences.props | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props index 1dd68a0a6294..5d97436270e9 100644 --- a/eng/IndirectReferences.props +++ b/eng/IndirectReferences.props @@ -1200,7 +1200,6 @@ - @@ -1743,7 +1742,6 @@ - @@ -2140,7 +2138,6 @@ - @@ -2802,7 +2799,6 @@ - @@ -3461,7 +3457,6 @@ - @@ -4145,7 +4140,6 @@ - @@ -4847,7 +4841,6 @@ - @@ -5040,7 +5033,6 @@ - @@ -5717,7 +5709,6 @@ - @@ -6620,7 +6611,6 @@ - @@ -7101,7 +7091,6 @@ - @@ -8481,7 +8470,6 @@ - @@ -9287,7 +9275,6 @@ - @@ -9660,7 +9647,6 @@ - @@ -10497,7 +10483,6 @@ - From ddc28783e8ba69895498c936ca2d50e440ec13ac Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 22 Oct 2019 14:54:36 -0700 Subject: [PATCH 099/116] Manual fixup --- eng/IndirectReferences.props | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props index 5d97436270e9..8c00ad1f016e 100644 --- a/eng/IndirectReferences.props +++ b/eng/IndirectReferences.props @@ -1146,7 +1146,6 @@ - @@ -1203,7 +1202,6 @@ - @@ -1745,7 +1743,6 @@ - @@ -1995,7 +1992,6 @@ - @@ -2139,7 +2135,6 @@ - @@ -2801,7 +2796,6 @@ - @@ -2870,7 +2864,6 @@ - @@ -2953,7 +2946,6 @@ - @@ -3460,7 +3452,6 @@ - @@ -5387,7 +5378,6 @@ - @@ -8474,7 +8464,6 @@ - @@ -9650,7 +9639,6 @@ - @@ -10486,7 +10474,6 @@ - From 7d8224da655746f97748b1892e17c9459556fbe1 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 22 Oct 2019 15:01:45 -0700 Subject: [PATCH 100/116] Manual fixup --- eng/IndirectReferences.props | 5 ----- 1 file changed, 5 deletions(-) diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props index 8c00ad1f016e..c57e61024d47 100644 --- a/eng/IndirectReferences.props +++ b/eng/IndirectReferences.props @@ -2815,7 +2815,6 @@ - @@ -4192,7 +4191,6 @@ - @@ -4770,7 +4768,6 @@ - @@ -5390,7 +5387,6 @@ - @@ -7645,7 +7641,6 @@ - From 05d3390c82846c8aeaabc57c8ab268f5db955cd0 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 22 Oct 2019 16:09:06 -0700 Subject: [PATCH 101/116] Fix Mvc tests --- ...ouldNotBeAppliedToPageModelAnalyzerTest.cs | 2 +- .../test/CodeAnalysisExtensionsTest.cs | 2 +- .../MvcDiagnosticAnalyzerRunner.cs | 27 ++++++++++++++++++- .../test/TopLevelParameterNameAnalyzerTest.cs | 10 +++---- .../ActualApiResponseMetadataFactoryTest.cs | 8 +++--- ...AttributeCodeFixProviderIntegrationTest.cs | 4 +-- ...ModelValidationCheckCodeFixProviderTest.cs | 8 ++++-- .../test/ApiControllerFactsTest.cs | 4 +-- .../test/IgnoreCS1701WarningCodeFixRunner.cs | 18 +++++++++++++ .../test/Mvc.Api.Analyzers.Test.csproj | 1 + .../Mvc.Api.Analyzers/test/MvcFactsTest.cs | 2 +- .../test/SymbolApiConventionMatcherTest.cs | 2 +- .../SymbolApiResponseMetadataProviderTest.cs | 2 +- .../test/AssemblyPartExtensionTest.cs | 2 +- 14 files changed, 70 insertions(+), 22 deletions(-) create mode 100644 src/Mvc/Mvc.Api.Analyzers/test/IgnoreCS1701WarningCodeFixRunner.cs diff --git a/src/Mvc/Mvc.Analyzers/test/AttributesShouldNotBeAppliedToPageModelAnalyzerTest.cs b/src/Mvc/Mvc.Analyzers/test/AttributesShouldNotBeAppliedToPageModelAnalyzerTest.cs index baac0e3b4f4d..2c271ff9323e 100644 --- a/src/Mvc/Mvc.Analyzers/test/AttributesShouldNotBeAppliedToPageModelAnalyzerTest.cs +++ b/src/Mvc/Mvc.Analyzers/test/AttributesShouldNotBeAppliedToPageModelAnalyzerTest.cs @@ -7,7 +7,7 @@ using Microsoft.CodeAnalysis; using Xunit; -namespace Microsoft.AspNetCore.Mvc.Analyzers.Test +namespace Microsoft.AspNetCore.Mvc.Analyzers { public class AttributesShouldNotBeAppliedToPageModelAnalyzerTest { diff --git a/src/Mvc/Mvc.Analyzers/test/CodeAnalysisExtensionsTest.cs b/src/Mvc/Mvc.Analyzers/test/CodeAnalysisExtensionsTest.cs index a9630cba1f31..129ed81059fa 100644 --- a/src/Mvc/Mvc.Analyzers/test/CodeAnalysisExtensionsTest.cs +++ b/src/Mvc/Mvc.Analyzers/test/CodeAnalysisExtensionsTest.cs @@ -491,7 +491,7 @@ public async Task IsAssignable_ReturnsTrueIfAncestorTypeImplementsInterface() private Task GetCompilation([CallerMemberName] string testMethod = "") { var testSource = MvcTestSource.Read(GetType().Name, testMethod); - var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source }); return project.GetCompilationAsync(); } diff --git a/src/Mvc/Mvc.Analyzers/test/Infrastructure/MvcDiagnosticAnalyzerRunner.cs b/src/Mvc/Mvc.Analyzers/test/Infrastructure/MvcDiagnosticAnalyzerRunner.cs index f29cff84d1f6..2b4b8dca9a9c 100644 --- a/src/Mvc/Mvc.Analyzers/test/Infrastructure/MvcDiagnosticAnalyzerRunner.cs +++ b/src/Mvc/Mvc.Analyzers/test/Infrastructure/MvcDiagnosticAnalyzerRunner.cs @@ -2,6 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Collections.Immutable; +using System.IO; +using System.Linq; +using System.Reflection; using System.Threading.Tasks; using Microsoft.AspNetCore.Analyzer.Testing; using Microsoft.CodeAnalysis; @@ -20,7 +24,28 @@ public MvcDiagnosticAnalyzerRunner(DiagnosticAnalyzer analyzer) public Task GetDiagnosticsAsync(string source) { - return GetDiagnosticsAsync(sources: new[] { source }, Analyzer, Array.Empty()); + var project = CreateProjectWithReferencesInBinDir(GetType().Assembly, source); + + return GetDiagnosticsAsync(project); + } + + public static Project CreateProjectWithReferencesInBinDir(Assembly testAssembly, params string[] source) + { + // The deps file in the project is incorrect and does not contain "compile" nodes for some references. + // However these binaries are always present in the bin output. As a "temporary" workaround, we'll add + // every dll file that's present in the test's build output as a metadatareference. + + var project = DiagnosticProject.Create(testAssembly, source); + + foreach (var assembly in Directory.EnumerateFiles(AppContext.BaseDirectory, "*.dll")) + { + if (!project.MetadataReferences.Any(c => string.Equals(Path.GetFileNameWithoutExtension(c.Display), Path.GetFileNameWithoutExtension(assembly), StringComparison.OrdinalIgnoreCase))) + { + project = project.AddMetadataReference(MetadataReference.CreateFromFile(assembly)); + } + } + + return project; } public Task GetDiagnosticsAsync(Project project) diff --git a/src/Mvc/Mvc.Analyzers/test/TopLevelParameterNameAnalyzerTest.cs b/src/Mvc/Mvc.Analyzers/test/TopLevelParameterNameAnalyzerTest.cs index 361f6d3cb502..8efec91c16ca 100644 --- a/src/Mvc/Mvc.Analyzers/test/TopLevelParameterNameAnalyzerTest.cs +++ b/src/Mvc/Mvc.Analyzers/test/TopLevelParameterNameAnalyzerTest.cs @@ -126,7 +126,7 @@ public async Task IsProblematicParameter_IgnoresNonPublicProperties() private async Task IsProblematicParameterTest([CallerMemberName] string testMethod = "") { var testSource = MvcTestSource.Read(GetType().Name, testMethod); - var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source }); var compilation = await project.GetCompilationAsync(); @@ -207,7 +207,7 @@ public async Task GetName_ReturnsFirstName_IfMultipleAttributesAreSpecified() private async Task GetCompilationForGetName() { var testSource = MvcTestSource.Read(GetType().Name, "GetNameTests"); - var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source }); var compilation = await project.GetCompilationAsync(); return compilation; @@ -218,7 +218,7 @@ public async Task SpecifiesModelType_ReturnsFalse_IfModelBinderDoesNotSpecifyTyp { var testMethod = nameof(SpecifiesModelType_ReturnsFalse_IfModelBinderDoesNotSpecifyType); var testSource = MvcTestSource.Read(GetType().Name, "SpecifiesModelTypeTests"); - var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source }); var compilation = await project.GetCompilationAsync(); Assert.True(TopLevelParameterNameAnalyzer.SymbolCache.TryCreate(compilation, out var symbolCache)); @@ -236,7 +236,7 @@ public async Task SpecifiesModelType_ReturnsTrue_IfModelBinderSpecifiesTypeFromC { var testMethod = nameof(SpecifiesModelType_ReturnsTrue_IfModelBinderSpecifiesTypeFromConstructor); var testSource = MvcTestSource.Read(GetType().Name, "SpecifiesModelTypeTests"); - var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source }); var compilation = await project.GetCompilationAsync(); Assert.True(TopLevelParameterNameAnalyzer.SymbolCache.TryCreate(compilation, out var symbolCache)); @@ -254,7 +254,7 @@ public async Task SpecifiesModelType_ReturnsTrue_IfModelBinderSpecifiesTypeFromP { var testMethod = nameof(SpecifiesModelType_ReturnsTrue_IfModelBinderSpecifiesTypeFromProperty); var testSource = MvcTestSource.Read(GetType().Name, "SpecifiesModelTypeTests"); - var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source }); var compilation = await project.GetCompilationAsync(); Assert.True(TopLevelParameterNameAnalyzer.SymbolCache.TryCreate(compilation, out var symbolCache)); diff --git a/src/Mvc/Mvc.Api.Analyzers/test/ActualApiResponseMetadataFactoryTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/ActualApiResponseMetadataFactoryTest.cs index d9c15bddaa89..cca12582dd9c 100644 --- a/src/Mvc/Mvc.Api.Analyzers/test/ActualApiResponseMetadataFactoryTest.cs +++ b/src/Mvc/Mvc.Api.Analyzers/test/ActualApiResponseMetadataFactoryTest.cs @@ -64,7 +64,7 @@ public IActionResult Get(int id) } } }"; - var project = DiagnosticProject.Create(GetType().Assembly, new[] { source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { source }); var compilation = await project.GetCompilationAsync(); Assert.True(ApiControllerSymbolCache.TryCreate(compilation, out var symbolCache)); @@ -301,7 +301,7 @@ public async Task TryGetActualResponseMetadata_ActionReturningNotFoundAndModel() private async Task<(bool result, IList responseMetadatas, TestSource testSource)> TryGetActualResponseMetadata(string typeName, string methodName) { var testSource = MvcTestSource.Read(GetType().Name, "TryGetActualResponseMetadataTests"); - var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source }); var compilation = await GetCompilation("TryGetActualResponseMetadataTests"); @@ -340,7 +340,7 @@ public async Task TryGetActualResponseMetadata_ActionReturningNotFoundAndModel() private async Task RunInspectReturnStatementSyntax(string source, string test) { - var project = DiagnosticProject.Create(GetType().Assembly, new[] { source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { source }); var compilation = await project.GetCompilationAsync(); Assert.True(ApiControllerSymbolCache.TryCreate(compilation, out var symbolCache)); @@ -361,7 +361,7 @@ public async Task TryGetActualResponseMetadata_ActionReturningNotFoundAndModel() private Task GetCompilation(string test) { var testSource = MvcTestSource.Read(GetType().Name, test); - var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source }); return project.GetCompilationAsync(); } diff --git a/src/Mvc/Mvc.Api.Analyzers/test/AddResponseTypeAttributeCodeFixProviderIntegrationTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/AddResponseTypeAttributeCodeFixProviderIntegrationTest.cs index 9ba677d101f5..10a77b8b42a2 100644 --- a/src/Mvc/Mvc.Api.Analyzers/test/AddResponseTypeAttributeCodeFixProviderIntegrationTest.cs +++ b/src/Mvc/Mvc.Api.Analyzers/test/AddResponseTypeAttributeCodeFixProviderIntegrationTest.cs @@ -13,7 +13,7 @@ public class AddResponseTypeAttributeCodeFixProviderIntegrationTest { private MvcDiagnosticAnalyzerRunner AnalyzerRunner { get; } = new MvcDiagnosticAnalyzerRunner(new ApiConventionAnalyzer()); - private CodeFixRunner CodeFixRunner => CodeFixRunner.Default; + private CodeFixRunner CodeFixRunner { get; } = new IgnoreCS1701WarningCodeFixRunner(); [Fact] public Task CodeFixAddsStatusCodes() => RunTest(); @@ -75,7 +75,7 @@ private async Task RunTest([CallerMemberName] string testMethod = "") private Project GetProject(string testMethod) { var testSource = Read(testMethod + ".Input"); - return DiagnosticProject.Create(GetType().Assembly, new[] { testSource }); + return MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource }); } private string Read(string fileName) diff --git a/src/Mvc/Mvc.Api.Analyzers/test/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest.cs index 918a04940abd..e38f26d58a7b 100644 --- a/src/Mvc/Mvc.Api.Analyzers/test/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest.cs +++ b/src/Mvc/Mvc.Api.Analyzers/test/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest.cs @@ -13,7 +13,7 @@ public class ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTe { private MvcDiagnosticAnalyzerRunner AnalyzerRunner { get; } = new MvcDiagnosticAnalyzerRunner(new ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzer()); - private CodeFixRunner CodeFixRunner => CodeFixRunner.Default; + private CodeFixRunner CodeFixRunner { get; } = new IgnoreCS1701WarningCodeFixRunner(); [Fact] public Task CodeFixRemovesModelStateIsInvalidBlockWithIfNotCheck() @@ -48,7 +48,7 @@ private async Task RunTest([CallerMemberName] string testMethod = "") private Project GetProject(string testMethod) { var testSource = Read(testMethod + ".Input"); - return DiagnosticProject.Create(GetType().Assembly, new[] { testSource }); + return MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource }); } private string Read(string fileName) @@ -60,3 +60,7 @@ private string Read(string fileName) } } } + +namespace Microsoft.AspNetCore.Mvc.Api.Analyzers +{ +} \ No newline at end of file diff --git a/src/Mvc/Mvc.Api.Analyzers/test/ApiControllerFactsTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/ApiControllerFactsTest.cs index 786aeeb9d758..6c2f5a81d17e 100644 --- a/src/Mvc/Mvc.Api.Analyzers/test/ApiControllerFactsTest.cs +++ b/src/Mvc/Mvc.Api.Analyzers/test/ApiControllerFactsTest.cs @@ -35,7 +35,7 @@ public DoesNotExist Get(int id) } } }"; - var project = DiagnosticProject.Create(GetType().Assembly, new[] { source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { source }); var compilation = await project.GetCompilationAsync(); Assert.True(ApiControllerSymbolCache.TryCreate(compilation, out var symbolCache)); var method = (IMethodSymbol)compilation.GetTypeByMetadataName("TestNamespace.TestController").GetMembers("Get").First(); @@ -130,7 +130,7 @@ public async Task IsApiControllerAction_ReturnsTrue_IfAttributeIsDeclaredOnAssem private Task GetCompilation(string testFile = "TestFile") { var testSource = MvcTestSource.Read(GetType().Name, testFile); - var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source }); return project.GetCompilationAsync(); } diff --git a/src/Mvc/Mvc.Api.Analyzers/test/IgnoreCS1701WarningCodeFixRunner.cs b/src/Mvc/Mvc.Api.Analyzers/test/IgnoreCS1701WarningCodeFixRunner.cs new file mode 100644 index 000000000000..e46b39f1458b --- /dev/null +++ b/src/Mvc/Mvc.Api.Analyzers/test/IgnoreCS1701WarningCodeFixRunner.cs @@ -0,0 +1,18 @@ +// 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.Linq; +using Microsoft.AspNetCore.Analyzer.Testing; +using Microsoft.CodeAnalysis; + +namespace Microsoft.AspNetCore.Mvc.Api.Analyzers +{ + public class IgnoreCS1701WarningCodeFixRunner : CodeFixRunner + { + protected override CompilationOptions ConfigureCompilationOptions(CompilationOptions options) + { + options = base.ConfigureCompilationOptions(options); + return options.WithSpecificDiagnosticOptions(new[] { "CS1701" }.ToDictionary(c => c, _ => ReportDiagnostic.Suppress)); + } + } +} \ No newline at end of file diff --git a/src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj b/src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj index 285dfc786624..ed41847a5c5a 100644 --- a/src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj +++ b/src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj @@ -9,6 +9,7 @@ false + true diff --git a/src/Mvc/Mvc.Api.Analyzers/test/MvcFactsTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/MvcFactsTest.cs index 054426295190..4498d009f174 100644 --- a/src/Mvc/Mvc.Api.Analyzers/test/MvcFactsTest.cs +++ b/src/Mvc/Mvc.Api.Analyzers/test/MvcFactsTest.cs @@ -226,7 +226,7 @@ private IMethodSymbol GetDisposableDispose(Compilation compilation) private Task GetCompilation(string test) { var testSource = MvcTestSource.Read(GetType().Name, test); - var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source }); return project.GetCompilationAsync(); } diff --git a/src/Mvc/Mvc.Api.Analyzers/test/SymbolApiConventionMatcherTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/SymbolApiConventionMatcherTest.cs index 1d0ab00c1b2e..011485292c1c 100644 --- a/src/Mvc/Mvc.Api.Analyzers/test/SymbolApiConventionMatcherTest.cs +++ b/src/Mvc/Mvc.Api.Analyzers/test/SymbolApiConventionMatcherTest.cs @@ -559,7 +559,7 @@ public async Task GetTypeMatchBehavior_ReturnsValueFromAttributes() private Task GetCompilationAsync(string test = "SymbolApiConventionMatcherTestFile") { var testSource = MvcTestSource.Read(GetType().Name, test); - var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source }); return project.GetCompilationAsync(); } diff --git a/src/Mvc/Mvc.Api.Analyzers/test/SymbolApiResponseMetadataProviderTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/SymbolApiResponseMetadataProviderTest.cs index f9adfa062afc..daf18e83f179 100644 --- a/src/Mvc/Mvc.Api.Analyzers/test/SymbolApiResponseMetadataProviderTest.cs +++ b/src/Mvc/Mvc.Api.Analyzers/test/SymbolApiResponseMetadataProviderTest.cs @@ -478,7 +478,7 @@ public async Task GetErrorResponseType_ReturnsTypeDefinedAtAction() private Task GetCompilation(string test) { var testSource = MvcTestSource.Read(GetType().Name, test); - var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source }); return project.GetCompilationAsync(); } diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/test/AssemblyPartExtensionTest.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/AssemblyPartExtensionTest.cs index eb84d8572815..b66e0df3c96f 100644 --- a/src/Mvc/Mvc.Razor.RuntimeCompilation/test/AssemblyPartExtensionTest.cs +++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/AssemblyPartExtensionTest.cs @@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationParts { public class AssemblyPartExtensionTest { - [Fact] + [Fact(Skip = "Deps file generation is incorrect, investigation ongoing.")] public void GetReferencePaths_ReturnsReferencesFromDependencyContext_IfPreserveCompilationContextIsSet() { // Arrange From b412576394545b2eea5b8d1de4173abae50443bd Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 22 Oct 2019 16:19:44 -0700 Subject: [PATCH 102/116] Cleanup --- ...tRequireExplicitModelValidationCheckCodeFixProviderTest.cs | 4 ---- src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj | 1 - 2 files changed, 5 deletions(-) diff --git a/src/Mvc/Mvc.Api.Analyzers/test/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest.cs index e38f26d58a7b..b8b096d9c947 100644 --- a/src/Mvc/Mvc.Api.Analyzers/test/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest.cs +++ b/src/Mvc/Mvc.Api.Analyzers/test/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest.cs @@ -60,7 +60,3 @@ private string Read(string fileName) } } } - -namespace Microsoft.AspNetCore.Mvc.Api.Analyzers -{ -} \ No newline at end of file diff --git a/src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj b/src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj index ed41847a5c5a..285dfc786624 100644 --- a/src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj +++ b/src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj @@ -9,7 +9,6 @@ false - true From cc350d4d64e534b63a83021ee95346dbbfcfc02c Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 22 Oct 2019 16:43:59 -0700 Subject: [PATCH 103/116] Fix E2E test timeouts --- .../test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj index bb38838369e1..98f6b7532001 100644 --- a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj +++ b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj @@ -34,6 +34,7 @@ + From 317444fa40e39ca5aa4fe508bb7d45d86a0628ce Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 22 Oct 2019 18:56:05 -0700 Subject: [PATCH 104/116] Revert change that broke extensions references Somehow we started compiling against extensions implementations, need to rework this logic --- eng/targets/ResolveReferences.targets | 56 ++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index e0bae2ce0a4d..f4f01191cc03 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -161,7 +161,61 @@ - <_ExtensionPackageReferences Include="@(_LatestPackageReferenceWithVersion)" Condition=" Exists('$(MicrosoftInternalExtensionsRefsPath)%(FileName).dll') " /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.Abstractions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.Memory" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.SqlServer" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.StackExchangeRedis" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.Abstractions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.AzureKeyVault" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.Binder" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.CommandLine" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.EnvironmentVariables" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.FileExtensions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.Ini" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.Json" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.KeyPerFile" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.NewtonsoftJson" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.UserSecrets" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.DependencyInjection.Abstractions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.DependencyInjection" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.DiagnosticAdapter" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Diagnostics.HealthChecks" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileProviders.Abstractions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileProviders.Composite" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileProviders.Embedded" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileProviders.Physical" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileSystemGlobbing" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Hosting.Abstractions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Hosting" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Hosting.Systemd" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Hosting.WindowsServices" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Http" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Http.Polly" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Localization.Abstractions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Localization" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.Abstractions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.AzureAppServices" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.Configuration" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.Console" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.Debug" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.EventLog" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.EventSource" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.TraceSource" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.ObjectPool" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Options.ConfigurationExtensions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Options.DataAnnotations" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Options" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Primitives" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.WebEncoders" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.JSInterop" /> + <_ExtensionInternalRefAssemblies Include="Mono.WebAssembly.Interop" /> + + + <_NonExtensionPackageReferences Include="@(_LatestPackageReferenceWithVersion)" Exclude="@(_ExtensionInternalRefAssemblies)" /> + <_ExtensionPackageReferences Include="@(_LatestPackageReferenceWithVersion)" Exclude="@(_NonExtensionPackageReferences)" /> <_LatestPackageReferenceWithVersion Remove="@(_ExtensionPackageReferences)" /> From bc9c4cd89828bc29e384fc6ff581b6407a984aa5 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 22 Oct 2019 19:14:44 -0700 Subject: [PATCH 105/116] Fix Analyzer tests --- .../Analyzers/test/AnalyzerTestBase.cs | 2 +- .../test/AnalyzersDiagnosticAnalyzerRunner.cs | 26 ++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/Analyzers/Analyzers/test/AnalyzerTestBase.cs b/src/Analyzers/Analyzers/test/AnalyzerTestBase.cs index ed80fa3d08de..269c50a394b0 100644 --- a/src/Analyzers/Analyzers/test/AnalyzerTestBase.cs +++ b/src/Analyzers/Analyzers/test/AnalyzerTestBase.cs @@ -39,7 +39,7 @@ public Project CreateProject(string source) } var read = Read(source); - return DiagnosticProject.Create(GetType().Assembly, new[] { read.Source, }); + return AnalyzersDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { read.Source, }); } public Task CreateCompilationAsync(string source) diff --git a/src/Analyzers/Analyzers/test/AnalyzersDiagnosticAnalyzerRunner.cs b/src/Analyzers/Analyzers/test/AnalyzersDiagnosticAnalyzerRunner.cs index 57a8ce8a697f..f54a187c0e7e 100644 --- a/src/Analyzers/Analyzers/test/AnalyzersDiagnosticAnalyzerRunner.cs +++ b/src/Analyzers/Analyzers/test/AnalyzersDiagnosticAnalyzerRunner.cs @@ -2,6 +2,9 @@ // 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 System.Reflection; using System.Threading.Tasks; using Microsoft.AspNetCore.Analyzer.Testing; using Microsoft.CodeAnalysis; @@ -20,7 +23,28 @@ public AnalyzersDiagnosticAnalyzerRunner(DiagnosticAnalyzer analyzer) public Task GetDiagnosticsAsync(string source) { - return GetDiagnosticsAsync(sources: new[] { source }, Analyzer, Array.Empty()); + var project = CreateProjectWithReferencesInBinDir(GetType().Assembly, source); + + return GetDiagnosticsAsync(project); + } + + public static Project CreateProjectWithReferencesInBinDir(Assembly testAssembly, params string[] source) + { + // The deps file in the project is incorrect and does not contain "compile" nodes for some references. + // However these binaries are always present in the bin output. As a "temporary" workaround, we'll add + // every dll file that's present in the test's build output as a metadatareference. + + var project = DiagnosticProject.Create(testAssembly, source); + + foreach (var assembly in Directory.EnumerateFiles(AppContext.BaseDirectory, "*.dll")) + { + if (!project.MetadataReferences.Any(c => string.Equals(Path.GetFileNameWithoutExtension(c.Display), Path.GetFileNameWithoutExtension(assembly), StringComparison.OrdinalIgnoreCase))) + { + project = project.AddMetadataReference(MetadataReference.CreateFromFile(assembly)); + } + } + + return project; } public Task GetDiagnosticsAsync(Project project) From e8081994b25ded43edc070753c8323c7558efaae Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 23 Oct 2019 01:57:29 -0700 Subject: [PATCH 106/116] Experimental fix for StaticFiles.FunctionalTest --- .../Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj b/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj index 0cc9e2e73ecb..82bb9259ae6f 100644 --- a/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj +++ b/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj @@ -26,6 +26,11 @@ + + + From c91034c71fe776f670ea78e871c9cb1119a77e81 Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 23 Oct 2019 02:39:22 -0700 Subject: [PATCH 107/116] Fix SignalR functional tests --- .../SignalR.Client.FunctionalTestApp.csproj | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTestApp.csproj b/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTestApp.csproj index 64a4eb43cab9..eb6dcab8f21b 100644 --- a/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTestApp.csproj +++ b/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTestApp.csproj @@ -41,6 +41,13 @@ + + + + + From 1b92a0e9722872aac7839d167c6a80a680541dda Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 23 Oct 2019 11:35:30 -0700 Subject: [PATCH 108/116] Fix Mvc Functional test with runtime compilation --- .../Mvc.FunctionalTests/ErrorPageTests.cs | 25 ++++++++++++++++++- .../Mvc.FunctionalTests/RazorBuildTest.cs | 23 +++++++++++++++-- 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/src/Mvc/test/Mvc.FunctionalTests/ErrorPageTests.cs b/src/Mvc/test/Mvc.FunctionalTests/ErrorPageTests.cs index 5cd72354c6e3..6ca0e5c650fc 100644 --- a/src/Mvc/test/Mvc.FunctionalTests/ErrorPageTests.cs +++ b/src/Mvc/test/Mvc.FunctionalTests/ErrorPageTests.cs @@ -2,6 +2,7 @@ // 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 System.Net; using System.Net.Http; @@ -9,6 +10,8 @@ using System.Text.Encodings.Web; using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation; +using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; @@ -27,6 +30,8 @@ public class ErrorPageTests : IClassFixture _fixture; + public ErrorPageTests( MvcTestFixture fixture, ITestOutputHelper testOutputHelper) @@ -41,6 +46,8 @@ public ErrorPageTests( .CreateDefaultClient(); // These tests want to verify runtime compilation and formatting in the HTML of the error page Client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("text/html")); + + _fixture = fixture; } public HttpClient Client { get; } @@ -49,12 +56,18 @@ public ErrorPageTests( public async Task CompilationFailuresAreListedByErrorPageMiddleware() { // Arrange + var factory = _fixture.Factories.FirstOrDefault() ?? _fixture.WithWebHostBuilder(b => b.UseStartup()); + factory = factory.WithWebHostBuilder(b => b.ConfigureTestServices(serviceCollection => serviceCollection.Configure(ConfigureRuntimeCompilationOptions))); + + var client = factory.CreateDefaultClient(); + client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("text/html")); + var action = "CompilationFailure"; var expected = "Cannot implicitly convert type 'int' to 'string'"; var expectedMediaType = MediaTypeHeaderValue.Parse("text/html; charset=utf-8"); // Act - var response = await Client.GetAsync("http://localhost/" + action); + var response = await client.GetAsync("http://localhost/" + action); // Assert Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); @@ -63,6 +76,16 @@ public async Task CompilationFailuresAreListedByErrorPageMiddleware() Assert.Contains($"{action}.cshtml", content); Assert.Contains(expected, content); Assert.DoesNotContain(PreserveCompilationContextMessage, content); + + static void ConfigureRuntimeCompilationOptions(MvcRazorRuntimeCompilationOptions options) + { + // Workaround for incorrectly generated deps file. The build output has all of the binaries required to compile. We'll grab these and + // add it to the list of assemblies runtime compilation uses. + foreach (var path in Directory.EnumerateFiles(AppContext.BaseDirectory, "*.dll")) + { + options.AdditionalReferencePaths.Add(path); + } + } } [Fact] diff --git a/src/Mvc/test/Mvc.FunctionalTests/RazorBuildTest.cs b/src/Mvc/test/Mvc.FunctionalTests/RazorBuildTest.cs index ba90b3594767..26ba921a68ea 100644 --- a/src/Mvc/test/Mvc.FunctionalTests/RazorBuildTest.cs +++ b/src/Mvc/test/Mvc.FunctionalTests/RazorBuildTest.cs @@ -3,9 +3,15 @@ using System; using System.Collections.Generic; +using System.IO; +using System.Linq; using System.Net; using System.Net.Http; using System.Threading.Tasks; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation; +using Microsoft.AspNetCore.TestHost; +using Microsoft.Extensions.DependencyInjection; using Xunit; namespace Microsoft.AspNetCore.Mvc.FunctionalTests @@ -14,7 +20,20 @@ public class RazorBuildTest : IClassFixture fixture) { - Client = fixture.CreateDefaultClient(); + var factory = fixture.Factories.FirstOrDefault() ?? fixture.WithWebHostBuilder(b => b.UseStartup()); + factory = factory.WithWebHostBuilder(b => b.ConfigureTestServices(serviceCollection => serviceCollection.Configure(ConfigureRuntimeCompilationOptions))); + + Client = factory.CreateDefaultClient(); + + static void ConfigureRuntimeCompilationOptions(MvcRazorRuntimeCompilationOptions options) + { + // Workaround for incorrectly generated deps file. The build output has all of the binaries required to compile. We'll grab these and + // add it to the list of assemblies runtime compilation uses. + foreach (var path in Directory.EnumerateFiles(AppContext.BaseDirectory, "*.dll")) + { + options.AdditionalReferencePaths.Add(path); + } + } } public HttpClient Client { get; } @@ -77,7 +96,7 @@ public async Task RazorViews_AreUpdatedOnChange() var actual2 = body.Trim(); Assert.NotEqual(expected1, actual2); - // Act - 3 + // Act - 3 // With all things being the same, expect a cached compilation body = await Client.GetStringAsync("/UpdateableViews"); From 9ea129ab27220c418844885898e0d19b560cb92c Mon Sep 17 00:00:00 2001 From: John Luo Date: Thu, 24 Oct 2019 22:18:39 -0700 Subject: [PATCH 109/116] Experimental fix: try pinning Extensions versions in package override --- src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj index f09e7229e06f..e562ea61906a 100644 --- a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj +++ b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj @@ -154,7 +154,10 @@ This package is an internal implementation of the .NET Core SDK and is not meant Outputs="$(TargetDir)$(PackageConflictManifestFileName)"> - <_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(NuGetPackageId)|%(NuGetPackageVersion)')" Condition=" '%(ReferencePath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND '%(ReferencePath.NuGetSourceType)' == 'Package' " /> + + <_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(NuGetPackageId)|%(NuGetPackageVersion)')" Condition="!Exists('$(MicrosoftInternalExtensionsRefsPath)%(ReferencePath.NuGetPackageId).dll') AND '%(ReferencePath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND '%(ReferencePath.NuGetSourceType)' == 'Package' " /> + + <_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(NuGetPackageId)|3.0.0')" Condition="Exists('$(MicrosoftInternalExtensionsRefsPath)%(ReferencePath.NuGetPackageId).dll') AND '%(ReferencePath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND '%(ReferencePath.NuGetSourceType)' == 'Package' " /> <_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(FileName)|$(ReferencePackSharedFxVersion)')" Condition=" '%(ReferencePath.ReferenceSourceTarget)' == 'ProjectReference' AND '%(ReferencePath.IsReferenceAssembly)' == 'true' " /> From 401db225b9374a6998a884b69103a2038a3a7529 Mon Sep 17 00:00:00 2001 From: John Luo Date: Fri, 25 Oct 2019 16:31:08 -0700 Subject: [PATCH 110/116] Cleanup part1 --- eng/Versions.props | 2 ++ src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj | 2 +- src/Middleware/CORS/test/testassets/Directory.Build.props | 7 +++++++ .../testassets/InProcessWebSite/InProcessWebSite.csproj | 5 +++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b2c6f720a57d..32eab2e35ed9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,6 +22,8 @@ 9 preview$(BlazorClientPreReleasePreviewNumber) $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) + + 3.0.0 false <_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(NuGetPackageId)|%(NuGetPackageVersion)')" Condition="!Exists('$(MicrosoftInternalExtensionsRefsPath)%(ReferencePath.NuGetPackageId).dll') AND '%(ReferencePath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND '%(ReferencePath.NuGetSourceType)' == 'Package' " /> - <_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(NuGetPackageId)|3.0.0')" Condition="Exists('$(MicrosoftInternalExtensionsRefsPath)%(ReferencePath.NuGetPackageId).dll') AND '%(ReferencePath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND '%(ReferencePath.NuGetSourceType)' == 'Package' " /> + <_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(NuGetPackageId)|$(MicrosoftInternalExtensionsRefsPackageOverrideVersion)')" Condition="Exists('$(MicrosoftInternalExtensionsRefsPath)%(ReferencePath.NuGetPackageId).dll') AND '%(ReferencePath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND '%(ReferencePath.NuGetSourceType)' == 'Package' " /> <_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(FileName)|$(ReferencePackSharedFxVersion)')" Condition=" '%(ReferencePath.ReferenceSourceTarget)' == 'ProjectReference' AND '%(ReferencePath.IsReferenceAssembly)' == 'true' " /> diff --git a/src/Middleware/CORS/test/testassets/Directory.Build.props b/src/Middleware/CORS/test/testassets/Directory.Build.props index b49282fb6f94..b8ad72d258a1 100644 --- a/src/Middleware/CORS/test/testassets/Directory.Build.props +++ b/src/Middleware/CORS/test/testassets/Directory.Build.props @@ -6,4 +6,11 @@ + + + + + diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj index 8c80a84b626c..9e4c1832f8dc 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj @@ -15,6 +15,11 @@ + + + From 9783b9e35faecf5976900cce0f698647088294b2 Mon Sep 17 00:00:00 2001 From: = Date: Fri, 25 Oct 2019 23:08:52 -0700 Subject: [PATCH 111/116] Fix HttpOverrides tests --- .../test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj b/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj index c5f9652ddca2..eb0950221c0f 100644 --- a/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj +++ b/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj @@ -5,6 +5,11 @@ + + + From 054f3533ab83621a629750337adad5854c3787f6 Mon Sep 17 00:00:00 2001 From: John Luo Date: Sun, 27 Oct 2019 00:03:25 -0700 Subject: [PATCH 112/116] Cleanup and revert some unneeded fixes --- .azure/pipelines/jobs/default-build.yml | 2 +- eng/targets/ReferenceAssembly.targets | 2 +- eng/targets/ResolveReferences.targets | 2 +- src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj | 7 +++---- .../test/Infrastructure/Directory.Build.props.in | 2 -- src/ProjectTemplates/test/ProjectTemplates.Tests.csproj | 2 +- 6 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index 3260269d9e46..6004bc15a8bc 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -58,7 +58,7 @@ parameters: installTar: true installNodeJs: true installJdk: true - timeoutInMinutes: 300 + timeoutInMinutes: 180 # We need longer than the default amount of 5 minutes to upload our logs/artifacts. (We currently take around 5 mins in the best case). # This makes sure we have time to upload everything in the case of a build timeout - really important for investigating a build diff --git a/eng/targets/ReferenceAssembly.targets b/eng/targets/ReferenceAssembly.targets index 0b8235c91eb8..5f4345e0c481 100644 --- a/eng/targets/ReferenceAssembly.targets +++ b/eng/targets/ReferenceAssembly.targets @@ -63,7 +63,7 @@ <_GenAPICommand Condition="'$(MSBuildRuntimeType)' == 'core'">"$(DotNetTool)" --roll-forward-on-no-candidate-fx 2 "$(_GenAPIPath)" <_GenAPICmd>$(_GenAPICommand) - <_GenAPICmd>$(_GenAPICmd) "$(TargetPath)" $(AdditionalGenApiCmdOptions) + <_GenAPICmd>$(_GenAPICmd) "$(TargetPath)" <_GenAPICmd>$(_GenAPICmd) --lib-path "@(_ReferencePathDirectories)" <_GenAPICmd>$(_GenAPICmd) --out "$(_RefSourceFileOutputPath)" <_GenAPICmd>$(_GenAPICmd) --header-file "$(RepoRoot)/eng/LicenseHeader.txt" diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index f4f01191cc03..340ceabe6446 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -160,7 +160,7 @@ - + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.Abstractions" /> <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.Memory" /> <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.SqlServer" /> diff --git a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj index a9a5201ac230..c54cd6e23747 100644 --- a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj +++ b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj @@ -18,9 +18,6 @@ This package is an internal implementation of the .NET Core SDK and is not meant DotnetPlatform ref/$(TargetFramework)/ - - true - false @@ -40,7 +37,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant true - MSB3243 + MSB3243 + + $(NoWarn);NU5131;NU5128 FrameworkList.xml diff --git a/src/ProjectTemplates/test/Infrastructure/Directory.Build.props.in b/src/ProjectTemplates/test/Infrastructure/Directory.Build.props.in index 496a3a1179bc..6186fc2f15a1 100644 --- a/src/ProjectTemplates/test/Infrastructure/Directory.Build.props.in +++ b/src/ProjectTemplates/test/Infrastructure/Directory.Build.props.in @@ -1,5 +1,3 @@ - - diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj index 729b912cc7ea..2e7d562230ca 100644 --- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj +++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj @@ -128,7 +128,7 @@ From ea8186616ccfb27aba5e68b0d2375e5b1a981c89 Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 28 Oct 2019 00:12:39 -0700 Subject: [PATCH 113/116] Undo unneeded changes --- ...spNetCore.Authentication.AzureAD.FunctionalTests.csproj | 2 -- ...rosoft.AspNetCore.Components.Authorization.Tests.csproj | 1 - .../test/Microsoft.AspNetCore.Blazor.Build.Tests.csproj | 1 - .../Microsoft.AspNetCore.Components.Forms.Tests.csproj | 1 - .../Microsoft.AspNetCore.Components.Server.Tests.csproj | 1 - .../Microsoft.AspNetCore.Components.E2ETests.csproj | 7 ------- src/Components/test/Ignitor.Test/Ignitor.Test.csproj | 1 - .../ComponentsApp.Server/ComponentsApp.Server.csproj | 3 --- src/Components/test/testassets/Ignitor/Ignitor.csproj | 1 - .../testassets/TestServer/Components.TestServer.csproj | 3 --- ...osoft.AspNetCore.DataProtection.Extensions.Tests.csproj | 1 - .../Microsoft.AspNetCore.FunctionalTests.csproj | 1 - .../Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj | 1 - .../Microsoft.AspNetCore.Hosting.FunctionalTests.csproj | 1 - .../Microsoft.AspNetCore.Http.Abstractions.Tests.csproj | 1 - .../Microsoft.AspNetCore.Identity.FunctionalTests.csproj | 2 -- .../Microsoft.AspNetCore.Identity.Test.csproj | 1 - .../FunctionalTests/Diagnostics.FunctionalTests.csproj | 1 - .../UnitTests/Microsoft.AspNetCore.WebSockets.Tests.csproj | 1 - .../test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj | 1 - .../test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj | 2 -- .../test/Microsoft.AspNetCore.Mvc.Core.Test.csproj | 2 -- .../test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj | 1 - .../Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj | 1 - .../Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj | 1 - .../test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj | 2 -- .../Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test.csproj | 3 --- ...oft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj | 6 ------ .../test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj | 6 ------ .../test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj | 6 ------ .../test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj | 5 ----- .../test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj | 3 --- src/Mvc/Mvc/test/Microsoft.AspNetCore.Mvc.Test.csproj | 7 ------- .../Microsoft.AspNetCore.Mvc.Performance.csproj | 2 -- .../Microsoft.AspNetCore.Mvc.FunctionalTests.csproj | 7 ------- .../Microsoft.AspNetCore.Mvc.IntegrationTests.csproj | 3 --- .../AuthSamples.FunctionalTests.csproj | 4 ---- .../IIS/benchmarks/IIS.Performance/IIS.Performance.csproj | 1 - .../IIS/IIS/samples/NativeIISSample/NativeIISSample.csproj | 1 - .../IIS.NewHandler.FunctionalTests.csproj | 1 - .../IIS.NewShim.FunctionalTests.csproj | 1 - src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj | 1 - .../IISExpress.FunctionalTests.csproj | 1 - .../IIS.Common.TestLib/IIS.Common.TestLib.csproj | 1 - .../test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj | 1 - .../InMemory.FunctionalTests.csproj | 1 - .../Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj | 1 - .../test/Sockets.BindTests/Sockets.BindTests.csproj | 1 - .../ServerComparison.FunctionalTests.csproj | 1 - ...rosoft.AspNetCore.SignalR.Client.FunctionalTests.csproj | 4 ---- .../Microsoft.AspNetCore.SignalR.Client.Tests.csproj | 4 ---- .../Microsoft.AspNetCore.Http.Connections.Tests.csproj | 2 -- .../test/Microsoft.AspNetCore.SignalR.Common.Tests.csproj | 1 - .../Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj | 2 -- .../SignalR/test/Microsoft.AspNetCore.SignalR.Tests.csproj | 7 ------- ...soft.AspNetCore.SignalR.StackExchangeRedis.Tests.csproj | 6 ------ 56 files changed, 131 deletions(-) diff --git a/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj b/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj index c8dd4f20e12c..b13ff3e5f8e9 100644 --- a/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj +++ b/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj @@ -15,8 +15,6 @@ - - diff --git a/src/Components/Authorization/test/Microsoft.AspNetCore.Components.Authorization.Tests.csproj b/src/Components/Authorization/test/Microsoft.AspNetCore.Components.Authorization.Tests.csproj index 024f4386e6b2..fedc3e7a4e36 100644 --- a/src/Components/Authorization/test/Microsoft.AspNetCore.Components.Authorization.Tests.csproj +++ b/src/Components/Authorization/test/Microsoft.AspNetCore.Components.Authorization.Tests.csproj @@ -6,7 +6,6 @@ - diff --git a/src/Components/Blazor/Build/test/Microsoft.AspNetCore.Blazor.Build.Tests.csproj b/src/Components/Blazor/Build/test/Microsoft.AspNetCore.Blazor.Build.Tests.csproj index b79b049cd041..0263c9f8004a 100644 --- a/src/Components/Blazor/Build/test/Microsoft.AspNetCore.Blazor.Build.Tests.csproj +++ b/src/Components/Blazor/Build/test/Microsoft.AspNetCore.Blazor.Build.Tests.csproj @@ -23,7 +23,6 @@ - diff --git a/src/Components/Forms/test/Microsoft.AspNetCore.Components.Forms.Tests.csproj b/src/Components/Forms/test/Microsoft.AspNetCore.Components.Forms.Tests.csproj index c5402913c93b..e78bb47ed33c 100644 --- a/src/Components/Forms/test/Microsoft.AspNetCore.Components.Forms.Tests.csproj +++ b/src/Components/Forms/test/Microsoft.AspNetCore.Components.Forms.Tests.csproj @@ -6,7 +6,6 @@ - diff --git a/src/Components/Server/test/Microsoft.AspNetCore.Components.Server.Tests.csproj b/src/Components/Server/test/Microsoft.AspNetCore.Components.Server.Tests.csproj index 8dd140b8eb5c..4e8dfbf7f24c 100644 --- a/src/Components/Server/test/Microsoft.AspNetCore.Components.Server.Tests.csproj +++ b/src/Components/Server/test/Microsoft.AspNetCore.Components.Server.Tests.csproj @@ -5,7 +5,6 @@ - diff --git a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj index 98f6b7532001..0e9797db822c 100644 --- a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj +++ b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj @@ -27,14 +27,7 @@ - - - - - - - diff --git a/src/Components/test/Ignitor.Test/Ignitor.Test.csproj b/src/Components/test/Ignitor.Test/Ignitor.Test.csproj index 5852da3e88ea..ad35b17b424b 100644 --- a/src/Components/test/Ignitor.Test/Ignitor.Test.csproj +++ b/src/Components/test/Ignitor.Test/Ignitor.Test.csproj @@ -6,7 +6,6 @@ - diff --git a/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj b/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj index 3b4a2a086ff9..52a6e6206c86 100644 --- a/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj +++ b/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj @@ -6,10 +6,7 @@ - - - diff --git a/src/Components/test/testassets/Ignitor/Ignitor.csproj b/src/Components/test/testassets/Ignitor/Ignitor.csproj index cebb3b5e9337..6816e44df150 100644 --- a/src/Components/test/testassets/Ignitor/Ignitor.csproj +++ b/src/Components/test/testassets/Ignitor/Ignitor.csproj @@ -9,7 +9,6 @@ - diff --git a/src/Components/test/testassets/TestServer/Components.TestServer.csproj b/src/Components/test/testassets/TestServer/Components.TestServer.csproj index 8b1ba281c700..62b354608a3d 100644 --- a/src/Components/test/testassets/TestServer/Components.TestServer.csproj +++ b/src/Components/test/testassets/TestServer/Components.TestServer.csproj @@ -8,10 +8,7 @@ - - - diff --git a/src/DataProtection/Extensions/test/Microsoft.AspNetCore.DataProtection.Extensions.Tests.csproj b/src/DataProtection/Extensions/test/Microsoft.AspNetCore.DataProtection.Extensions.Tests.csproj index 87c0b1b93459..2ed2eb310d60 100644 --- a/src/DataProtection/Extensions/test/Microsoft.AspNetCore.DataProtection.Extensions.Tests.csproj +++ b/src/DataProtection/Extensions/test/Microsoft.AspNetCore.DataProtection.Extensions.Tests.csproj @@ -12,7 +12,6 @@ - diff --git a/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj index 8483f3e5c613..efef69f71352 100644 --- a/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj +++ b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj @@ -26,7 +26,6 @@ - diff --git a/src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj b/src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj index 7eafcfb863c2..4bc7d5cf3891 100644 --- a/src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj +++ b/src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj @@ -17,7 +17,6 @@ - diff --git a/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj b/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj index 1bd62691e074..c848da3647bf 100644 --- a/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj +++ b/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj @@ -20,7 +20,6 @@ - diff --git a/src/Http/Http.Abstractions/test/Microsoft.AspNetCore.Http.Abstractions.Tests.csproj b/src/Http/Http.Abstractions/test/Microsoft.AspNetCore.Http.Abstractions.Tests.csproj index b6fa741a9285..962602a87265 100644 --- a/src/Http/Http.Abstractions/test/Microsoft.AspNetCore.Http.Abstractions.Tests.csproj +++ b/src/Http/Http.Abstractions/test/Microsoft.AspNetCore.Http.Abstractions.Tests.csproj @@ -10,7 +10,6 @@ - diff --git a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj index db7f44026e8e..534f1b50a5cb 100644 --- a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj +++ b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj @@ -22,8 +22,6 @@ - - diff --git a/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj b/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj index b0a947b17697..4b7ada7431f3 100644 --- a/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj +++ b/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj @@ -17,7 +17,6 @@ - diff --git a/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj b/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj index 3532e1860838..4c8951746c3d 100644 --- a/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj +++ b/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj @@ -17,7 +17,6 @@ - diff --git a/src/Middleware/WebSockets/test/UnitTests/Microsoft.AspNetCore.WebSockets.Tests.csproj b/src/Middleware/WebSockets/test/UnitTests/Microsoft.AspNetCore.WebSockets.Tests.csproj index abd367de2bd3..42aefeaebdfd 100644 --- a/src/Middleware/WebSockets/test/UnitTests/Microsoft.AspNetCore.WebSockets.Tests.csproj +++ b/src/Middleware/WebSockets/test/UnitTests/Microsoft.AspNetCore.WebSockets.Tests.csproj @@ -7,7 +7,6 @@ - diff --git a/src/Mvc/Mvc.Abstractions/test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj b/src/Mvc/Mvc.Abstractions/test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj index bcec533abdb5..28eee994cdc3 100644 --- a/src/Mvc/Mvc.Abstractions/test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj +++ b/src/Mvc/Mvc.Abstractions/test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj @@ -6,7 +6,6 @@ - diff --git a/src/Mvc/Mvc.ApiExplorer/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj b/src/Mvc/Mvc.ApiExplorer/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj index d67450b16ef1..df8bb63d3bc9 100644 --- a/src/Mvc/Mvc.ApiExplorer/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj +++ b/src/Mvc/Mvc.ApiExplorer/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj @@ -5,8 +5,6 @@ - - diff --git a/src/Mvc/Mvc.Core/test/Microsoft.AspNetCore.Mvc.Core.Test.csproj b/src/Mvc/Mvc.Core/test/Microsoft.AspNetCore.Mvc.Core.Test.csproj index 956ef5fb6879..1552b9c6e49d 100644 --- a/src/Mvc/Mvc.Core/test/Microsoft.AspNetCore.Mvc.Core.Test.csproj +++ b/src/Mvc/Mvc.Core/test/Microsoft.AspNetCore.Mvc.Core.Test.csproj @@ -10,8 +10,6 @@ - - diff --git a/src/Mvc/Mvc.Cors/test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj b/src/Mvc/Mvc.Cors/test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj index 1ff316ccca36..ce15e8efbc76 100644 --- a/src/Mvc/Mvc.Cors/test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj +++ b/src/Mvc/Mvc.Cors/test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj @@ -5,7 +5,6 @@ - diff --git a/src/Mvc/Mvc.DataAnnotations/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj b/src/Mvc/Mvc.DataAnnotations/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj index 34294c7daa57..c205a676cd24 100644 --- a/src/Mvc/Mvc.DataAnnotations/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj +++ b/src/Mvc/Mvc.DataAnnotations/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj @@ -7,7 +7,6 @@ - diff --git a/src/Mvc/Mvc.Formatters.Xml/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj b/src/Mvc/Mvc.Formatters.Xml/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj index a6025358094e..b51ba4d2dffc 100644 --- a/src/Mvc/Mvc.Formatters.Xml/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj +++ b/src/Mvc/Mvc.Formatters.Xml/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj @@ -7,7 +7,6 @@ - diff --git a/src/Mvc/Mvc.Localization/test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj b/src/Mvc/Mvc.Localization/test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj index ebb1452de0a6..db22eeedb5b2 100644 --- a/src/Mvc/Mvc.Localization/test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj +++ b/src/Mvc/Mvc.Localization/test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj @@ -5,8 +5,6 @@ - - diff --git a/src/Mvc/Mvc.NewtonsoftJson/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test.csproj b/src/Mvc/Mvc.NewtonsoftJson/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test.csproj index 8b73ef8f9499..0cf127eac92f 100644 --- a/src/Mvc/Mvc.NewtonsoftJson/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test.csproj +++ b/src/Mvc/Mvc.NewtonsoftJson/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test.csproj @@ -6,10 +6,7 @@ - - - diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj index 77ce94f1a6e7..734825c240c3 100644 --- a/src/Mvc/Mvc.Razor.RuntimeCompilation/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj +++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj @@ -6,13 +6,7 @@ - - - - - - diff --git a/src/Mvc/Mvc.Razor/test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj b/src/Mvc/Mvc.Razor/test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj index 6865ebf428c9..0a8a4e0fc16d 100644 --- a/src/Mvc/Mvc.Razor/test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj +++ b/src/Mvc/Mvc.Razor/test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj @@ -13,12 +13,6 @@ - - - - - - diff --git a/src/Mvc/Mvc.RazorPages/test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj b/src/Mvc/Mvc.RazorPages/test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj index d717c09c3f32..3b4c6d6e7385 100644 --- a/src/Mvc/Mvc.RazorPages/test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj +++ b/src/Mvc/Mvc.RazorPages/test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj @@ -9,13 +9,7 @@ - - - - - - diff --git a/src/Mvc/Mvc.TagHelpers/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj b/src/Mvc/Mvc.TagHelpers/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj index 39858d982573..32e1fe210785 100644 --- a/src/Mvc/Mvc.TagHelpers/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj +++ b/src/Mvc/Mvc.TagHelpers/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj @@ -9,12 +9,7 @@ - - - - - diff --git a/src/Mvc/Mvc.ViewFeatures/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj b/src/Mvc/Mvc.ViewFeatures/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj index 52f38da3c3e1..5cfbdb8ff4bc 100644 --- a/src/Mvc/Mvc.ViewFeatures/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj +++ b/src/Mvc/Mvc.ViewFeatures/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj @@ -7,8 +7,5 @@ - - - diff --git a/src/Mvc/Mvc/test/Microsoft.AspNetCore.Mvc.Test.csproj b/src/Mvc/Mvc/test/Microsoft.AspNetCore.Mvc.Test.csproj index b327f52a027d..46985d199625 100644 --- a/src/Mvc/Mvc/test/Microsoft.AspNetCore.Mvc.Test.csproj +++ b/src/Mvc/Mvc/test/Microsoft.AspNetCore.Mvc.Test.csproj @@ -11,14 +11,7 @@ - - - - - - - diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj index 3ef36fe71484..2a032bf85600 100644 --- a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj +++ b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj @@ -9,8 +9,6 @@ - - diff --git a/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj b/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj index 8d938094ed04..09fbc8c5dc89 100644 --- a/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj +++ b/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj @@ -28,11 +28,7 @@ - - - - @@ -59,9 +55,6 @@ - - - diff --git a/src/Mvc/test/Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj b/src/Mvc/test/Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj index b4136eea559e..0e33905acc8d 100644 --- a/src/Mvc/test/Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj +++ b/src/Mvc/test/Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj @@ -7,10 +7,7 @@ - - - diff --git a/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj b/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj index d901794c4a72..d5dd2d3c1705 100644 --- a/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj +++ b/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj @@ -28,11 +28,7 @@ Value="true" /> - - - - diff --git a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj b/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj index 8447e433a7cd..44c1a66221f1 100644 --- a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj +++ b/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj @@ -34,7 +34,6 @@ - diff --git a/src/Servers/IIS/IIS/samples/NativeIISSample/NativeIISSample.csproj b/src/Servers/IIS/IIS/samples/NativeIISSample/NativeIISSample.csproj index cbd0d09765ad..7bc7433b75a4 100644 --- a/src/Servers/IIS/IIS/samples/NativeIISSample/NativeIISSample.csproj +++ b/src/Servers/IIS/IIS/samples/NativeIISSample/NativeIISSample.csproj @@ -11,7 +11,6 @@ - diff --git a/src/Servers/IIS/IIS/test/IIS.NewHandler.FunctionalTests/IIS.NewHandler.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.NewHandler.FunctionalTests/IIS.NewHandler.FunctionalTests.csproj index e2d4b3d4bab4..8720dcd37c9e 100644 --- a/src/Servers/IIS/IIS/test/IIS.NewHandler.FunctionalTests/IIS.NewHandler.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.NewHandler.FunctionalTests/IIS.NewHandler.FunctionalTests.csproj @@ -30,7 +30,6 @@ - diff --git a/src/Servers/IIS/IIS/test/IIS.NewShim.FunctionalTests/IIS.NewShim.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.NewShim.FunctionalTests/IIS.NewShim.FunctionalTests.csproj index f15ea5e4664b..67b66fdea0c7 100644 --- a/src/Servers/IIS/IIS/test/IIS.NewShim.FunctionalTests/IIS.NewShim.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.NewShim.FunctionalTests/IIS.NewShim.FunctionalTests.csproj @@ -25,7 +25,6 @@ - diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj b/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj index ae9fdaae3dd5..cb9fc52dc152 100644 --- a/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj @@ -16,7 +16,6 @@ - diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj index b4f2c33a69a5..77d557ad873b 100644 --- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj @@ -27,7 +27,6 @@ - diff --git a/src/Servers/IIS/IIS/test/testassets/IIS.Common.TestLib/IIS.Common.TestLib.csproj b/src/Servers/IIS/IIS/test/testassets/IIS.Common.TestLib/IIS.Common.TestLib.csproj index 339da8e16df5..593ef0fbed2c 100644 --- a/src/Servers/IIS/IIS/test/testassets/IIS.Common.TestLib/IIS.Common.TestLib.csproj +++ b/src/Servers/IIS/IIS/test/testassets/IIS.Common.TestLib/IIS.Common.TestLib.csproj @@ -7,7 +7,6 @@ - diff --git a/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj b/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj index 678811e9621e..2a9f55cd6fd5 100644 --- a/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj +++ b/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj @@ -20,7 +20,6 @@ - diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj b/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj index 156b60c6bb30..c00165c4d433 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj @@ -21,7 +21,6 @@ - diff --git a/src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj b/src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj index aa9b1dae0825..acdbaa11d51c 100644 --- a/src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj +++ b/src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj @@ -22,7 +22,6 @@ - diff --git a/src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj b/src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj index d026d1aee400..cf9e6cfaef9a 100644 --- a/src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj +++ b/src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj @@ -17,7 +17,6 @@ - diff --git a/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj b/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj index 0d521a586ede..49e4b3a9a769 100644 --- a/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj +++ b/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj @@ -17,7 +17,6 @@ - diff --git a/src/SignalR/clients/csharp/Client/test/FunctionalTests/Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj b/src/SignalR/clients/csharp/Client/test/FunctionalTests/Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj index 7786564bf15f..8280917fc758 100644 --- a/src/SignalR/clients/csharp/Client/test/FunctionalTests/Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj +++ b/src/SignalR/clients/csharp/Client/test/FunctionalTests/Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj @@ -9,13 +9,9 @@ - - - - diff --git a/src/SignalR/clients/csharp/Client/test/UnitTests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj b/src/SignalR/clients/csharp/Client/test/UnitTests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj index 0371887acc62..cc45556edd00 100644 --- a/src/SignalR/clients/csharp/Client/test/UnitTests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj +++ b/src/SignalR/clients/csharp/Client/test/UnitTests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj @@ -16,10 +16,6 @@ - - - - diff --git a/src/SignalR/common/Http.Connections/test/Microsoft.AspNetCore.Http.Connections.Tests.csproj b/src/SignalR/common/Http.Connections/test/Microsoft.AspNetCore.Http.Connections.Tests.csproj index 323633104c4e..01f0769245e2 100644 --- a/src/SignalR/common/Http.Connections/test/Microsoft.AspNetCore.Http.Connections.Tests.csproj +++ b/src/SignalR/common/Http.Connections/test/Microsoft.AspNetCore.Http.Connections.Tests.csproj @@ -17,10 +17,8 @@ - - diff --git a/src/SignalR/common/SignalR.Common/test/Microsoft.AspNetCore.SignalR.Common.Tests.csproj b/src/SignalR/common/SignalR.Common/test/Microsoft.AspNetCore.SignalR.Common.Tests.csproj index 8c3be81d97f5..cfef1f1d74d0 100644 --- a/src/SignalR/common/SignalR.Common/test/Microsoft.AspNetCore.SignalR.Common.Tests.csproj +++ b/src/SignalR/common/SignalR.Common/test/Microsoft.AspNetCore.SignalR.Common.Tests.csproj @@ -15,7 +15,6 @@ - diff --git a/src/SignalR/perf/Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj b/src/SignalR/perf/Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj index 8ddcda860d2f..c007a68669ab 100644 --- a/src/SignalR/perf/Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj +++ b/src/SignalR/perf/Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj @@ -23,7 +23,6 @@ - @@ -31,7 +30,6 @@ - diff --git a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests.csproj b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests.csproj index c9dda26dbe8d..527ae19b1945 100644 --- a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests.csproj +++ b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests.csproj @@ -15,15 +15,8 @@ - - - - - - - diff --git a/src/SignalR/server/StackExchangeRedis/test/Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests.csproj b/src/SignalR/server/StackExchangeRedis/test/Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests.csproj index ea94e7071e77..8172acf1f6ed 100644 --- a/src/SignalR/server/StackExchangeRedis/test/Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests.csproj +++ b/src/SignalR/server/StackExchangeRedis/test/Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests.csproj @@ -9,13 +9,7 @@ - - - - - - From 3359b2bbc24ecf2400c3f689ba03effbb4b51af5 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 28 Oct 2019 09:47:15 -0700 Subject: [PATCH 114/116] Fix E2E test timeout --- .../test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj index 0e9797db822c..b67ea9184d20 100644 --- a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj +++ b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj @@ -28,6 +28,7 @@ + From af73cd8d490d0d56c592d37b48161cf1f0e7984b Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 28 Oct 2019 10:42:25 -0700 Subject: [PATCH 115/116] add comment --- .../test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj index b67ea9184d20..9bf03e1c503c 100644 --- a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj +++ b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj @@ -28,6 +28,7 @@ + From 2cc841d9864b2fef6a6d274f9d9f05395cbc9764 Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 28 Oct 2019 12:56:09 -0700 Subject: [PATCH 116/116] Missed updates --- src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj | 2 -- .../Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj | 2 -- .../IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj | 1 - 3 files changed, 5 deletions(-) diff --git a/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj b/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj index 9e56292e5a58..ac0e53051620 100644 --- a/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj +++ b/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj @@ -16,9 +16,7 @@ - - diff --git a/src/Mvc/shared/Mvc.Views.TestCommon/Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj b/src/Mvc/shared/Mvc.Views.TestCommon/Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj index 76e74a3374e3..14d8694a65f7 100644 --- a/src/Mvc/shared/Mvc.Views.TestCommon/Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj +++ b/src/Mvc/shared/Mvc.Views.TestCommon/Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj @@ -7,8 +7,6 @@ - - diff --git a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj index 0dc360611da5..d7d6ba4fc547 100644 --- a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj @@ -24,7 +24,6 @@ -