diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b6ad95fd684c..981468d74b21 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,304 +9,304 @@ --> - + https://github.com/dotnet/efcore - 7af5e17706cf5414b273d1aa4a2d45c2b98cffd0 + 99166b37d72cb6adca7fe1cb9f8511b8a6dd3192 - + https://github.com/dotnet/efcore - 7af5e17706cf5414b273d1aa4a2d45c2b98cffd0 + 99166b37d72cb6adca7fe1cb9f8511b8a6dd3192 - + https://github.com/dotnet/efcore - 7af5e17706cf5414b273d1aa4a2d45c2b98cffd0 + 99166b37d72cb6adca7fe1cb9f8511b8a6dd3192 - + https://github.com/dotnet/efcore - 7af5e17706cf5414b273d1aa4a2d45c2b98cffd0 + 99166b37d72cb6adca7fe1cb9f8511b8a6dd3192 - + https://github.com/dotnet/efcore - 7af5e17706cf5414b273d1aa4a2d45c2b98cffd0 + 99166b37d72cb6adca7fe1cb9f8511b8a6dd3192 - + https://github.com/dotnet/efcore - 7af5e17706cf5414b273d1aa4a2d45c2b98cffd0 + 99166b37d72cb6adca7fe1cb9f8511b8a6dd3192 - + https://github.com/dotnet/efcore - 7af5e17706cf5414b273d1aa4a2d45c2b98cffd0 + 99166b37d72cb6adca7fe1cb9f8511b8a6dd3192 - + https://github.com/dotnet/efcore - 7af5e17706cf5414b273d1aa4a2d45c2b98cffd0 + 99166b37d72cb6adca7fe1cb9f8511b8a6dd3192 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/emsdk - e51b2a920817aec200d7306b95f616f9451d47a3 + 4352f818926282e9d5ecbc9d8a411e006d5a7853 - + https://github.com/dotnet/emsdk - e51b2a920817aec200d7306b95f616f9451d47a3 + 4352f818926282e9d5ecbc9d8a411e006d5a7853 - + https://github.com/dotnet/emsdk - e51b2a920817aec200d7306b95f616f9451d47a3 + 4352f818926282e9d5ecbc9d8a411e006d5a7853 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 - + https://github.com/dotnet/runtime - 355eff52bed00e7ca9d4a6d769ddbe2bbadbea47 + d25620b3fe5fba7b8fd7065f2d5947d0a20c6a30 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 3d653a726e61..1b22b4921d27 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,81 +65,81 @@ --> - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21212.1 - 6.0.0-preview.4.21212.1 - 6.0.0-preview.4.21212.1 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 - 6.0.0-preview.4.21211.7 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.5.21216.2 + 6.0.0-preview.5.21216.2 + 6.0.0-preview.5.21216.2 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 + 6.0.0-preview.4.21215.13 - 6.0.0-preview.4.21211.7 + 6.0.0-preview.4.21215.13 - 6.0.0-preview.4.21212.2 - 6.0.0-preview.4.21212.2 - 6.0.0-preview.4.21212.2 - 6.0.0-preview.4.21212.2 - 6.0.0-preview.4.21212.2 - 6.0.0-preview.4.21212.2 - 6.0.0-preview.4.21212.2 - 6.0.0-preview.4.21212.2 + 6.0.0-preview.4.21215.1 + 6.0.0-preview.4.21215.1 + 6.0.0-preview.4.21215.1 + 6.0.0-preview.4.21215.1 + 6.0.0-preview.4.21215.1 + 6.0.0-preview.4.21215.1 + 6.0.0-preview.4.21215.1 + 6.0.0-preview.4.21215.1 6.0.0-beta.21209.17 @@ -206,8 +206,8 @@ 1.0.705.50 1.4.0 6.10.0 - 5.9.0 - 5.9.0 + 5.10.0-preview.2.7203 + 5.10.0-preview.2.7203 5.0.0-alpha.20560.6 2.1.1 diff --git a/global.json b/global.json index 80a4bed0a310..2769795efc49 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "6.0.100-preview.3.21168.19" + "version": "6.0.100-preview.4.21216.8" }, "tools": { - "dotnet": "6.0.100-preview.3.21168.19", + "dotnet": "6.0.100-preview.4.21216.8", "runtimes": { "dotnet/x64": [ "2.1.25", diff --git a/src/Components/WebAssembly/testassets/WasmLinkerTest/WasmLinkerTest.csproj b/src/Components/WebAssembly/testassets/WasmLinkerTest/WasmLinkerTest.csproj index 978ad91b8215..94c22eb57ff4 100644 --- a/src/Components/WebAssembly/testassets/WasmLinkerTest/WasmLinkerTest.csproj +++ b/src/Components/WebAssembly/testassets/WasmLinkerTest/WasmLinkerTest.csproj @@ -3,6 +3,7 @@ $(DefaultNetCoreTargetFramework) browser-wasm true + true diff --git a/src/Mvc/test/Mvc.FunctionalTests/ErrorPageTests.cs b/src/Mvc/test/Mvc.FunctionalTests/ErrorPageTests.cs index ec3e9ce39faa..c1b001509678 100644 --- a/src/Mvc/test/Mvc.FunctionalTests/ErrorPageTests.cs +++ b/src/Mvc/test/Mvc.FunctionalTests/ErrorPageTests.cs @@ -80,6 +80,8 @@ public async Task CompilationFailuresAreListedByErrorPageMiddleware() static void ConfigureRuntimeCompilationOptions(MvcRazorRuntimeCompilationOptions options) { + options.AdditionalReferencePaths.Add(typeof(string).Assembly.Location); + // 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")) diff --git a/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs b/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs index f920e0240355..a28b2c434677 100644 --- a/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs +++ b/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs @@ -120,6 +120,23 @@ NUnit 3 Test Item (nunit-test) VB * We don't want to construct this path so we'll rely on dotnet new --uninstall --help to construct the uninstall command. */ + // Workaround for https://github.com/dotnet/sdk/issues/16906 + // await UninstallExistingTemplatesAsync(output); + + foreach (var packagePath in builtPackages) + { + output.WriteLine($"Installing templates package {packagePath}..."); + var result = await RunDotNetNew(output, $"--install \"{packagePath}\""); + Assert.True(result.ExitCode == 0, result.GetFormattedOutput()); + } + + await VerifyCanFindTemplate(output, "webapp"); + await VerifyCanFindTemplate(output, "web"); + await VerifyCanFindTemplate(output, "react"); + } + + private static async Task UninstallExistingTemplatesAsync(ITestOutputHelper output) + { var proc = await RunDotNetNew(output, "--uninstall --help"); var lines = proc.Output.Split(Environment.NewLine); @@ -145,17 +162,6 @@ NUnit 3 Test Item (nunit-test) VB await VerifyCannotFindTemplateAsync(output, "react"); await VerifyCannotFindTemplateAsync(output, "reactredux"); await VerifyCannotFindTemplateAsync(output, "angular"); - - foreach (var packagePath in builtPackages) - { - output.WriteLine($"Installing templates package {packagePath}..."); - var result = await RunDotNetNew(output, $"--install \"{packagePath}\""); - Assert.True(result.ExitCode == 0, result.GetFormattedOutput()); - } - - await VerifyCanFindTemplate(output, "webapp"); - await VerifyCanFindTemplate(output, "web"); - await VerifyCanFindTemplate(output, "react"); } private static async Task VerifyCanFindTemplate(ITestOutputHelper output, string templateName) diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/StartupTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/StartupTests.cs index 592fd3eef2ed..ab6b80dc196f 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/StartupTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/StartupTests.cs @@ -422,6 +422,7 @@ public async Task TargedDifferenceSharedFramework_FailedToFindNativeDependencies } [ConditionalFact] + [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/31893")] [MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")] public async Task RemoveInProcessReference_FailedToFindRequestHandler() { diff --git a/src/Servers/Kestrel/Transport.Quic/src/AssemblyInfo.cs b/src/Servers/Kestrel/Transport.Quic/src/AssemblyInfo.cs index ea0b177b75c8..4549267cc0f8 100644 --- a/src/Servers/Kestrel/Transport.Quic/src/AssemblyInfo.cs +++ b/src/Servers/Kestrel/Transport.Quic/src/AssemblyInfo.cs @@ -2,5 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Runtime.CompilerServices; +using System.Runtime.Versioning; [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: SupportedOSPlatform("windows")] +[assembly: SupportedOSPlatform("macos")] +[assembly: SupportedOSPlatform("linux")]