Explorar o código

Update SDK, Unquarantine tests (#40858)

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

This reverts commit 1076cb33071cf2e4b9fddb006824c87f337e956e.

* Update SDK

* Fixup
William Godbe %!s(int64=4) %!d(string=hai) anos
pai
achega
9e756a88bb

+ 1 - 1
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

+ 2 - 2
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)"

+ 0 - 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);