From 7ce2e8e8b23e3ce0c55238766f6be7894be8a35e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 09:09:58 +0000 Subject: [PATCH 1/5] Update dependencies from https://github.com/dotnet/razor build 20231011.6 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23511.4 -> To Version 7.0.0-preview.23511.6 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b8df2d30a17c..af05e7a42fc1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore 34ef6922fb525dcecc8a3f9b7750414de93af438 - + https://github.com/dotnet/razor - ea7808bb229c458521f5059f4832a241dde927ac + 2eb555a245c1c2f1ded4cb381d3dd0f71746169c - + https://github.com/dotnet/razor - ea7808bb229c458521f5059f4832a241dde927ac + 2eb555a245c1c2f1ded4cb381d3dd0f71746169c - + https://github.com/dotnet/razor - ea7808bb229c458521f5059f4832a241dde927ac + 2eb555a245c1c2f1ded4cb381d3dd0f71746169c https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index c61fe809a94f..16460283cb92 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -157,9 +157,9 @@ - 7.0.0-preview.23511.4 - 7.0.0-preview.23511.4 - 7.0.0-preview.23511.4 + 7.0.0-preview.23511.6 + 7.0.0-preview.23511.6 + 7.0.0-preview.23511.6 From b34c1d7244362f277d5c3e127f882fcdbf23f0c6 Mon Sep 17 00:00:00 2001 From: Jan Jones Date: Thu, 12 Oct 2023 13:37:51 +0300 Subject: [PATCH 2/5] Fix xUnit warnings --- .../NuGetPackageInstallerTests.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Tests/Microsoft.DotNet.PackageInstall.Tests/NuGetPackageInstallerTests.cs b/src/Tests/Microsoft.DotNet.PackageInstall.Tests/NuGetPackageInstallerTests.cs index 5eca2434615c..b2be66a841a2 100644 --- a/src/Tests/Microsoft.DotNet.PackageInstall.Tests/NuGetPackageInstallerTests.cs +++ b/src/Tests/Microsoft.DotNet.PackageInstall.Tests/NuGetPackageInstallerTests.cs @@ -167,7 +167,7 @@ public async Task GivenARelativeSourcePathInstallSucceeds() } [Fact] - public void GivenNoPackageSourceMappingItShouldError() + public async Task GivenNoPackageSourceMappingItShouldError() { string getTestLocalFeedPath = GetTestLocalFeedPath(); string relativePath = Path.GetRelativePath(Environment.CurrentDirectory, getTestLocalFeedPath); @@ -179,16 +179,16 @@ public void GivenNoPackageSourceMappingItShouldError() var patterns = new ReadOnlyDictionary>(dictionary); var mockPackageSourceMapping = new PackageSourceMapping(patterns); - Action a = () => _toolInstaller.DownloadPackageAsync( + Func a = () => _toolInstaller.DownloadPackageAsync( TestPackageId, new NuGetVersion(TestPackageVersion), new PackageSourceLocation(sourceFeedOverrides: new[] { relativePath }), - packageSourceMapping: mockPackageSourceMapping).GetAwaiter().GetResult(); - a.Should().Throw().And.Message.Should().Contain(string.Format(Cli.NuGetPackageDownloader.LocalizableStrings.FailedToFindSourceUnderPackageSourceMapping, TestPackageId)); + packageSourceMapping: mockPackageSourceMapping); + (await a.Should().ThrowAsync()).And.Message.Should().Contain(string.Format(Cli.NuGetPackageDownloader.LocalizableStrings.FailedToFindSourceUnderPackageSourceMapping, TestPackageId)); } [Fact] - public void GivenPackageSourceMappingFeedNotFoundItShouldError() + public async Task GivenPackageSourceMappingFeedNotFoundItShouldError() { string getTestLocalFeedPath = GetTestLocalFeedPath(); string relativePath = Path.GetRelativePath(Environment.CurrentDirectory, getTestLocalFeedPath); @@ -200,12 +200,12 @@ public void GivenPackageSourceMappingFeedNotFoundItShouldError() var patterns = new ReadOnlyDictionary>(dictionary); var mockPackageSourceMapping = new PackageSourceMapping(patterns); - Action a = () => _toolInstaller.DownloadPackageAsync( + Func a = () => _toolInstaller.DownloadPackageAsync( TestPackageId, new NuGetVersion(TestPackageVersion), new PackageSourceLocation(sourceFeedOverrides: new[] { relativePath }), - packageSourceMapping: mockPackageSourceMapping).GetAwaiter().GetResult(); - a.Should().Throw().And.Message.Should().Contain(string.Format(Cli.NuGetPackageDownloader.LocalizableStrings.FailedToMapSourceUnderPackageSourceMapping, TestPackageId)); + packageSourceMapping: mockPackageSourceMapping); + (await a.Should().ThrowAsync()).And.Message.Should().Contain(string.Format(Cli.NuGetPackageDownloader.LocalizableStrings.FailedToMapSourceUnderPackageSourceMapping, TestPackageId)); } [Fact] From 30096753413e1042a1070ea409dc01cdaf9c7d69 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 11:13:59 +0000 Subject: [PATCH 3/5] Update dependencies from https://github.com/dotnet/razor build 20231012.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23511.4 -> To Version 7.0.0-preview.23512.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af05e7a42fc1..6053b5b02bf2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore 34ef6922fb525dcecc8a3f9b7750414de93af438 - + https://github.com/dotnet/razor - 2eb555a245c1c2f1ded4cb381d3dd0f71746169c + 50425dfcce504966217ab483863d1c258007f796 - + https://github.com/dotnet/razor - 2eb555a245c1c2f1ded4cb381d3dd0f71746169c + 50425dfcce504966217ab483863d1c258007f796 - + https://github.com/dotnet/razor - 2eb555a245c1c2f1ded4cb381d3dd0f71746169c + 50425dfcce504966217ab483863d1c258007f796 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 16460283cb92..dfe23c7e6d5a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -157,9 +157,9 @@ - 7.0.0-preview.23511.6 - 7.0.0-preview.23511.6 - 7.0.0-preview.23511.6 + 7.0.0-preview.23512.1 + 7.0.0-preview.23512.1 + 7.0.0-preview.23512.1 From 728d66d337cf7b6346794706fcdb076c9650a8e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 13:01:55 +0000 Subject: [PATCH 4/5] Update dependencies from https://github.com/dotnet/razor build 20231012.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23511.4 -> To Version 7.0.0-preview.23512.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6053b5b02bf2..1f8e555948d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore 34ef6922fb525dcecc8a3f9b7750414de93af438 - + https://github.com/dotnet/razor - 50425dfcce504966217ab483863d1c258007f796 + 23afad2ca6e9de2b205bcaaa391f9758681a36f2 - + https://github.com/dotnet/razor - 50425dfcce504966217ab483863d1c258007f796 + 23afad2ca6e9de2b205bcaaa391f9758681a36f2 - + https://github.com/dotnet/razor - 50425dfcce504966217ab483863d1c258007f796 + 23afad2ca6e9de2b205bcaaa391f9758681a36f2 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index dfe23c7e6d5a..71df7a8bd7ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -157,9 +157,9 @@ - 7.0.0-preview.23512.1 - 7.0.0-preview.23512.1 - 7.0.0-preview.23512.1 + 7.0.0-preview.23512.2 + 7.0.0-preview.23512.2 + 7.0.0-preview.23512.2 From bbffe2aac4812c9bc10cd85b4e682ae4ccd88223 Mon Sep 17 00:00:00 2001 From: Jan Jones Date: Fri, 25 Aug 2023 12:06:43 +0200 Subject: [PATCH 5/5] Use renamed Razor compiler DLLs --- .../Targets/Microsoft.NET.Sdk.Razor.Configuration.targets | 4 ++-- src/RazorSdk/Tool/DiscoverCommand.cs | 4 ++-- .../ScopedCssIntegrationTests.cs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.Configuration.targets b/src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.Configuration.targets index 162ba3f8416b..8f0fa59ba967 100644 --- a/src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.Configuration.targets +++ b/src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.Configuration.targets @@ -93,8 +93,8 @@ Copyright (c) .NET Foundation. All rights reserved. - Microsoft.AspNetCore.Mvc.Razor.Extensions - $(RazorSdkDirectoryRoot)tools\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll + Microsoft.CodeAnalysis.Razor.Compiler.Mvc + $(RazorSdkDirectoryRoot)tools\Microsoft.CodeAnalysis.Razor.Compiler.Mvc.dll diff --git a/src/RazorSdk/Tool/DiscoverCommand.cs b/src/RazorSdk/Tool/DiscoverCommand.cs index 26ffb93d20e8..fd67bdabc4bb 100644 --- a/src/RazorSdk/Tool/DiscoverCommand.cs +++ b/src/RazorSdk/Tool/DiscoverCommand.cs @@ -109,8 +109,8 @@ internal static void PatchExtensions(CommandOption extensionNames, CommandOption var extensionName = extensionNames.Values[i]; var replacementFileName = extensionName switch { - "MVC-1.0" or "MVC-1.1" => "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.dll", - "MVC-2.0" or "MVC-2.1" => "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.dll", + "MVC-1.0" or "MVC-1.1" => "Microsoft.CodeAnalysis.Razor.Compiler.Mvc.Version1_X.dll", + "MVC-2.0" or "MVC-2.1" => "Microsoft.CodeAnalysis.Razor.Compiler.Mvc.Version2_X.dll", _ => null, }; diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ScopedCssIntegrationTests.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ScopedCssIntegrationTests.cs index 1bd8241383e0..8469b0a9f7d5 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ScopedCssIntegrationTests.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ScopedCssIntegrationTests.cs @@ -90,7 +90,7 @@ public void CanOverrideScopeIdentifiers() var scoped = Path.Combine(intermediateOutputPath, "scopedcss", "Styles", "Pages", "Counter.rz.scp.css"); new FileInfo(scoped).Should().Exist(); new FileInfo(scoped).Should().Contain("b-overriden"); - var generated = Path.Combine(intermediateOutputPath, "generated", "Microsoft.NET.Sdk.Razor.SourceGenerators", "Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator", "Components_Pages_Counter_razor.g.cs"); + var generated = Path.Combine(intermediateOutputPath, "generated", "Microsoft.CodeAnalysis.Razor.Compiler.SourceGenerators", "Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator", "Components_Pages_Counter_razor.g.cs"); new FileInfo(generated).Should().Exist(); new FileInfo(generated).Should().Contain("b-overriden"); new FileInfo(Path.Combine(intermediateOutputPath, "scopedcss", "Components", "Pages", "Index.razor.rz.scp.css")).Should().NotExist(); @@ -319,7 +319,7 @@ public void Build_RemovingScopedCssAndBuilding_UpdatesGeneratedCodeAndBundle() new FileInfo(generatedBundle).Should().Exist(); var generatedProjectBundle = Path.Combine(intermediateOutputPath, "scopedcss", "projectbundle", "ComponentApp.bundle.scp.css"); new FileInfo(generatedProjectBundle).Should().Exist(); - var generatedCounter = Path.Combine(intermediateOutputPath, "generated", "Microsoft.NET.Sdk.Razor.SourceGenerators", "Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator", "Components_Pages_Counter_razor.g.cs"); + var generatedCounter = Path.Combine(intermediateOutputPath, "generated", "Microsoft.CodeAnalysis.Razor.Compiler.SourceGenerators", "Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator", "Components_Pages_Counter_razor.g.cs"); new FileInfo(generatedCounter).Should().Exist(); var componentThumbprint = FileThumbPrint.Create(generatedCounter);