From ae422fd2a82b58f6fb5ddc118e8cd1ff0b36337d Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Fri, 28 Apr 2023 07:09:18 +0000 Subject: [PATCH] Fix BlazorWasm projects --- .../WebScenarioTests.cs | 3 +- ...xtensions.ObjectPool-package-version.patch | 63 +++++++++++++++++++ 2 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 src/SourceBuild/patches/razor/0001-Fix-Microsoft.Extensions.ObjectPool-package-version.patch diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs index 525027683..56d0368f3 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs @@ -34,8 +34,7 @@ public class WebScenarioTests : SmokeTests } yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.Razor, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); - // TODO: Investigate and re-enable - //yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.BlazorWasm, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); + yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.BlazorWasm, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.BlazorServer, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.Worker); yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.Angular); diff --git a/src/SourceBuild/patches/razor/0001-Fix-Microsoft.Extensions.ObjectPool-package-version.patch b/src/SourceBuild/patches/razor/0001-Fix-Microsoft.Extensions.ObjectPool-package-version.patch new file mode 100644 index 000000000..1af0b6e93 --- /dev/null +++ b/src/SourceBuild/patches/razor/0001-Fix-Microsoft.Extensions.ObjectPool-package-version.patch @@ -0,0 +1,63 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nikola Milosavljevic +Date: Fri, 28 Apr 2023 07:06:18 +0000 +Subject: [PATCH] Fix Microsoft.Extensions.ObjectPool package version + +--- + eng/Versions.props | 2 ++ + src/Compiler/Directory.Packages.props | 2 +- + ...osoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace.csproj | 2 +- + .../Microsoft.AspNetCore.Razor.Utilities.Shared.csproj | 2 +- + 4 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index 559125601..6c101b515 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -94,6 +94,8 @@ + 17.5.0-preview-2-33117-317 + 17.5.274-preview + 17.6.4-preview ++ ++ 6.0.0 + + 6.0.0 + 6.0.0 +diff --git a/src/Compiler/Directory.Packages.props b/src/Compiler/Directory.Packages.props +index 118ed5d41..245b9bd4f 100644 +--- a/src/Compiler/Directory.Packages.props ++++ b/src/Compiler/Directory.Packages.props +@@ -30,6 +30,6 @@ + + + +- ++ + + +diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace.csproj b/src/Razor/src/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace.csproj +index 7a90709c3..278d12786 100644 +--- a/src/Razor/src/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace.csproj ++++ b/src/Razor/src/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace.csproj +@@ -11,7 +11,7 @@ + + + +- ++ + + + +diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj +index 7b7fbdd73..e591d60de 100644 +--- a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj ++++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj +@@ -11,7 +11,7 @@ + + + +- ++ + + +