dotnet
/
aspnetcore
зеркало из https://github.com/dotnet/aspnetcore.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Update SDK, Unquarantine tests (#40858) 

* Revert "Quarantine https://github.com/dotnet/aspnetcore/issues/40642"

This reverts commit 1076cb3307.

* Update SDK

* Fixup
This commit is contained in:
William Godbe 2022-03-25 09:01:40 -07:00 коммит произвёл GitHub
Родитель a5683c8fc2
Коммит 9e756a88bb
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 3 добавлений и 7 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
eng/scripts/GenerateProjectList.ps1
Просмотреть файл

@ -8,7 +8,7 @@ $msbuildEngine = 'dotnet'
$repoRoot = Resolve-Path "$PSScriptRoot/../.." $repoRoot = Resolve-Path "$PSScriptRoot/../.."
try { try {
& "$repoRoot\eng\common\msbuild.ps1" -ci:$ci "$repoRoot/eng/CodeGen.proj" /t:GenerateProjectList & "$repoRoot\eng\common\msbuild.ps1" -msbuildEngine $msbuildEngine -ci:$ci "$repoRoot/eng/CodeGen.proj" /t:GenerateProjectList
} finally { } finally {
Remove-Item variable:global:_BuildTool -ErrorAction Ignore Remove-Item variable:global:_BuildTool -ErrorAction Ignore
Remove-Item variable:global:_DotNetInstallDir -ErrorAction Ignore Remove-Item variable:global:_DotNetInstallDir -ErrorAction Ignore

4
global.json
Просмотреть файл

@ -1,9 +1,9 @@
{ {
"sdk": { "sdk": {
"version": "7.0.100-preview.3.22171.1" "version": "7.0.100-preview.4.22174.1"
}, },
"tools": { "tools": {
"dotnet": "7.0.100-preview.3.22171.1", "dotnet": "7.0.100-preview.4.22174.1",
"runtimes": { "runtimes": {
"dotnet/x86": [ "dotnet/x86": [
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"

4
src/Middleware/StaticFiles/test/UnitTests/DefaultFilesMiddlewareTests.cs
Просмотреть файл

@ -133,7 +133,6 @@ public class DefaultFilesMiddlewareTests
[InlineData("", @"./SubFolder", "", false)] [InlineData("", @"./SubFolder", "", false)]
[InlineData("", @"./SubFolder", "/你好", false)] [InlineData("", @"./SubFolder", "/你好", false)]
[InlineData("", @"./SubFolder", "/你好/世界", false)] [InlineData("", @"./SubFolder", "/你好/世界", false)]
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/40642")]
public async Task FoundDirectoryWithDefaultFile_PathModified_All(string baseUrl, string baseDir, string requestUrl, bool appendTrailingSlash = true) public async Task FoundDirectoryWithDefaultFile_PathModified_All(string baseUrl, string baseDir, string requestUrl, bool appendTrailingSlash = true)
{ {
await FoundDirectoryWithDefaultFile_PathModified(baseUrl, baseDir, requestUrl, appendTrailingSlash); await FoundDirectoryWithDefaultFile_PathModified(baseUrl, baseDir, requestUrl, appendTrailingSlash);
@ -154,7 +153,6 @@ public class DefaultFilesMiddlewareTests
[InlineData("", @".\subFolder", "", false)] [InlineData("", @".\subFolder", "", false)]
[InlineData("", @".\SubFolder", "/你好", false)] [InlineData("", @".\SubFolder", "/你好", false)]
[InlineData("", @".\SubFolder", "/你好/世界", false)] [InlineData("", @".\SubFolder", "/你好/世界", false)]
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/40642")]
public async Task FoundDirectoryWithDefaultFile_PathModified_Windows(string baseUrl, string baseDir, string requestUrl, bool appendTrailingSlash = true) public async Task FoundDirectoryWithDefaultFile_PathModified_Windows(string baseUrl, string baseDir, string requestUrl, bool appendTrailingSlash = true)
{ {
await FoundDirectoryWithDefaultFile_PathModified(baseUrl, baseDir, requestUrl, appendTrailingSlash); await FoundDirectoryWithDefaultFile_PathModified(baseUrl, baseDir, requestUrl, appendTrailingSlash);
@ -190,7 +188,6 @@ public class DefaultFilesMiddlewareTests
[InlineData("", @"./", "/SubFolder", "?a=b")] [InlineData("", @"./", "/SubFolder", "?a=b")]
[InlineData("", @"./SubFolder", "/你好", "?a=b")] [InlineData("", @"./SubFolder", "/你好", "?a=b")]
[InlineData("", @"./SubFolder", "/你好/世界", "?a=b")] [InlineData("", @"./SubFolder", "/你好/世界", "?a=b")]
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/40642")]
public async Task NearMatch_RedirectAddSlash_All(string baseUrl, string baseDir, string requestUrl, string queryString) public async Task NearMatch_RedirectAddSlash_All(string baseUrl, string baseDir, string requestUrl, string queryString)
{ {
await NearMatch_RedirectAddSlash(baseUrl, baseDir, requestUrl, queryString); await NearMatch_RedirectAddSlash(baseUrl, baseDir, requestUrl, queryString);
@ -203,7 +200,6 @@ public class DefaultFilesMiddlewareTests
[InlineData("", @".\", "/SubFolder", "?a=b")] [InlineData("", @".\", "/SubFolder", "?a=b")]
[InlineData("", @".\SubFolder", "/你好", "?a=b")] [InlineData("", @".\SubFolder", "/你好", "?a=b")]
[InlineData("", @".\SubFolder", "/你好/世界", "?a=b")] [InlineData("", @".\SubFolder", "/你好/世界", "?a=b")]
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/40642")]
public async Task NearMatch_RedirectAddSlash_Windows(string baseUrl, string baseDir, string requestUrl, string queryString) public async Task NearMatch_RedirectAddSlash_Windows(string baseUrl, string baseDir, string requestUrl, string queryString)
{ {
await NearMatch_RedirectAddSlash(baseUrl, baseDir, requestUrl, queryString); await NearMatch_RedirectAddSlash(baseUrl, baseDir, requestUrl, queryString);