diff --git a/eng/Dependencies.props b/eng/Dependencies.props index fc85bb7c248c..26dc86e0e31c 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -66,8 +66,8 @@ and are generated based on the last package release. - - + + diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 7dc26323656a..f30cfe800061 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -18,6 +18,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4b6b77cfbc5d..0dbfbbf5ed98 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,6 +206,10 @@ https://github.com/dotnet/runtime 040cbe276907174316e2cc07b35814b3069874a6 + + https://github.com/dotnet/runtime + 040cbe276907174316e2cc07b35814b3069874a6 + https://github.com/dotnet/runtime 040cbe276907174316e2cc07b35814b3069874a6 diff --git a/eng/Versions.props b/eng/Versions.props index 8445afebc84c..7fa6c5c6c32b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,6 +117,7 @@ 10.0.0-alpha.1.24617.3 10.0.0-alpha.1.24617.3 10.0.0-alpha.1.24617.3 + 10.0.0-alpha.1.24617.3 10.0.0-alpha.1.24617.3 10.0.0-alpha.1.24617.3 10.0.0-alpha.1.24617.3 @@ -208,7 +209,6 @@ 5.0.0-preview.3.20215.2 15.9.3032 - 8.0.0 4.7.0 5.0.0 @@ -256,7 +256,7 @@ --> 3.3.1 3.3.1 - 4.13.0-3.24613.7 4.13.0-3.24613.7 @@ -264,9 +264,9 @@ 4.13.0-3.24613.7 4.13.0-3.24613.7 3.3.3 - 1.1.2-beta1.24121.1 - 1.1.2-beta1.24121.1 - 1.1.2-beta1.24121.1 + 1.1.2 + 1.1.2 + 1.1.2 1.0.0-20230414.1 $(IdentityModelVersion) $(IdentityModelVersion) diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj index c462a7517ae0..aa59934196bc 100644 --- a/eng/tools/RepoTasks/RepoTasks.csproj +++ b/eng/tools/RepoTasks/RepoTasks.csproj @@ -35,8 +35,8 @@ - - + + diff --git a/src/Analyzers/Analyzers/test/Microsoft.AspNetCore.Analyzers.Test.csproj b/src/Analyzers/Analyzers/test/Microsoft.AspNetCore.Analyzers.Test.csproj index 5c89ff96a301..9290cc9741f5 100644 --- a/src/Analyzers/Analyzers/test/Microsoft.AspNetCore.Analyzers.Test.csproj +++ b/src/Analyzers/Analyzers/test/Microsoft.AspNetCore.Analyzers.Test.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Analyzers/Analyzers/test/StartupCSharpAnalyzerTest.cs b/src/Analyzers/Analyzers/test/StartupCSharpAnalyzerTest.cs index 42b9fbd86036..0e5e579977d9 100644 --- a/src/Analyzers/Analyzers/test/StartupCSharpAnalyzerTest.cs +++ b/src/Analyzers/Analyzers/test/StartupCSharpAnalyzerTest.cs @@ -5,11 +5,11 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp.Testing; using Microsoft.CodeAnalysis.Diagnostics; -using Microsoft.CodeAnalysis.Testing.Verifiers; +using Microsoft.CodeAnalysis.Testing; namespace Microsoft.AspNetCore.Analyzers; -internal sealed class StartupCSharpAnalyzerTest : CSharpAnalyzerTest +internal sealed class StartupCSharpAnalyzerTest : CSharpAnalyzerTest { public StartupCSharpAnalyzerTest(StartupAnalyzer analyzer, ImmutableArray metadataReferences) { diff --git a/src/Framework/AspNetCoreAnalyzers/test/Microsoft.AspNetCore.App.Analyzers.Test.csproj b/src/Framework/AspNetCoreAnalyzers/test/Microsoft.AspNetCore.App.Analyzers.Test.csproj index 5e75a5d1f451..7c95e4dab135 100644 --- a/src/Framework/AspNetCoreAnalyzers/test/Microsoft.AspNetCore.App.Analyzers.Test.csproj +++ b/src/Framework/AspNetCoreAnalyzers/test/Microsoft.AspNetCore.App.Analyzers.Test.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpAnalyzerVerifier.cs b/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpAnalyzerVerifier.cs index aa3ee600db1e..cfbc023573b3 100644 --- a/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpAnalyzerVerifier.cs +++ b/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpAnalyzerVerifier.cs @@ -9,7 +9,6 @@ using Microsoft.CodeAnalysis.CSharp.Testing; using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Testing; -using Microsoft.CodeAnalysis.Testing.Verifiers; using Microsoft.Extensions.DependencyInjection; using Microsoft.AspNetCore.Hosting; @@ -20,20 +19,20 @@ public static partial class CSharpAnalyzerVerifier { /// public static DiagnosticResult Diagnostic() - => CSharpAnalyzerVerifier.Diagnostic(); + => CSharpAnalyzerVerifier.Diagnostic(); /// public static DiagnosticResult Diagnostic(string diagnosticId) - => CSharpAnalyzerVerifier.Diagnostic(diagnosticId); + => CSharpAnalyzerVerifier.Diagnostic(diagnosticId); /// public static DiagnosticResult Diagnostic(DiagnosticDescriptor descriptor) - => CSharpAnalyzerVerifier.Diagnostic(descriptor); + => CSharpAnalyzerVerifier.Diagnostic(descriptor); /// public static async Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected) { - var test = new CSharpAnalyzerTest + var test = new CSharpAnalyzerTest { TestCode = source.ReplaceLineEndings(), // We need to set the output type to an exe to properly diff --git a/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpCodeFixVerifier.cs b/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpCodeFixVerifier.cs index 83f30d841e49..c39a1a87e87b 100644 --- a/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpCodeFixVerifier.cs +++ b/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpCodeFixVerifier.cs @@ -6,7 +6,6 @@ using Microsoft.CodeAnalysis.CSharp.Testing; using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Testing; -using Microsoft.CodeAnalysis.Testing.Verifiers; namespace Microsoft.AspNetCore.Analyzers.Verifiers; @@ -16,20 +15,20 @@ public static partial class CSharpCodeFixVerifier { /// public static DiagnosticResult Diagnostic() - => CSharpCodeFixVerifier.Diagnostic(); + => CSharpCodeFixVerifier.Diagnostic(); /// public static DiagnosticResult Diagnostic(string diagnosticId) - => CSharpCodeFixVerifier.Diagnostic(diagnosticId); + => CSharpCodeFixVerifier.Diagnostic(diagnosticId); /// public static DiagnosticResult Diagnostic(DiagnosticDescriptor descriptor) - => CSharpCodeFixVerifier.Diagnostic(descriptor); + => CSharpCodeFixVerifier.Diagnostic(descriptor); /// public static async Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected) { - var test = new CSharpCodeFixTest + var test = new CSharpCodeFixTest { TestCode = source.ReplaceLineEndings(), // We need to set the output type to an exe to properly @@ -54,7 +53,7 @@ public static async Task VerifyCodeFixAsync(string source, DiagnosticResult expe /// public static async Task VerifyCodeFixAsync(string source, DiagnosticResult[] expected, string fixedSource, int? expectedIterations = null, string usageSource = null, string codeActionEquivalenceKey = null) { - var test = new CSharpCodeFixTest + var test = new CSharpCodeFixTest { // We need to set the output type to an exe to properly // support top-level programs in the tests. Otherwise, diff --git a/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpSourceGeneratorVerifier.cs b/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpSourceGeneratorVerifier.cs index 544adc924754..13286b98f26f 100644 --- a/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpSourceGeneratorVerifier.cs +++ b/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpSourceGeneratorVerifier.cs @@ -6,7 +6,6 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp.Testing; using Microsoft.CodeAnalysis.Testing; -using Microsoft.CodeAnalysis.Testing.Verifiers; using Microsoft.CodeAnalysis.Text; namespace Microsoft.AspNetCore.Analyzers.Verifiers; diff --git a/src/Mvc/Mvc.Analyzers/test/AttributesShouldNotBeAppliedToPageModelAnalyzerTest.cs b/src/Mvc/Mvc.Analyzers/test/AttributesShouldNotBeAppliedToPageModelAnalyzerTest.cs index fe7ff9461633..a1d483ef99f4 100644 --- a/src/Mvc/Mvc.Analyzers/test/AttributesShouldNotBeAppliedToPageModelAnalyzerTest.cs +++ b/src/Mvc/Mvc.Analyzers/test/AttributesShouldNotBeAppliedToPageModelAnalyzerTest.cs @@ -7,7 +7,6 @@ using Microsoft.CodeAnalysis.CSharp.Testing; using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Testing; -using Microsoft.CodeAnalysis.Testing.Verifiers; namespace Microsoft.AspNetCore.Mvc.Analyzers; @@ -373,7 +372,7 @@ public void OnGet() private static Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected) { - var test = new AttributesShouldNotBeAppliedToPageModelCSharpAnalzyerTest(TestReferences.MetadataReferences) + var test = new AttributesShouldNotBeAppliedToPageModelCSharpAnalyzerTest(TestReferences.MetadataReferences) { TestCode = source, ReferenceAssemblies = TestReferences.EmptyReferenceAssemblies, @@ -383,9 +382,9 @@ private static Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] return test.RunAsync(); } - private sealed class AttributesShouldNotBeAppliedToPageModelCSharpAnalzyerTest : CSharpAnalyzerTest + private sealed class AttributesShouldNotBeAppliedToPageModelCSharpAnalyzerTest : CSharpAnalyzerTest { - public AttributesShouldNotBeAppliedToPageModelCSharpAnalzyerTest(ImmutableArray metadataReferences) + public AttributesShouldNotBeAppliedToPageModelCSharpAnalyzerTest(ImmutableArray metadataReferences) { TestState.AdditionalReferences.AddRange(metadataReferences); } diff --git a/src/Mvc/Mvc.Analyzers/test/AvoidHtmlPartialAnalyzerTest.cs b/src/Mvc/Mvc.Analyzers/test/AvoidHtmlPartialAnalyzerTest.cs index 142a2a01801c..af74e87a0f58 100644 --- a/src/Mvc/Mvc.Analyzers/test/AvoidHtmlPartialAnalyzerTest.cs +++ b/src/Mvc/Mvc.Analyzers/test/AvoidHtmlPartialAnalyzerTest.cs @@ -7,7 +7,6 @@ using Microsoft.CodeAnalysis.CSharp.Testing; using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Testing; -using Microsoft.CodeAnalysis.Testing.Verifiers; namespace Microsoft.AspNetCore.Mvc.Analyzers; @@ -412,7 +411,7 @@ public class DiagnosticsAreReturned_ForUseOfHtmlRenderPartial_InSections : globa private static Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected) { - var test = new AvoidHtmlPartialCSharpAnalzyerTest(TestReferences.MetadataReferences) + var test = new AvoidHtmlPartialCSharpAnalyzerTest(TestReferences.MetadataReferences) { TestCode = source, ReferenceAssemblies = TestReferences.EmptyReferenceAssemblies, @@ -422,9 +421,9 @@ private static Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] return test.RunAsync(); } - internal sealed class AvoidHtmlPartialCSharpAnalzyerTest : CSharpAnalyzerTest + internal sealed class AvoidHtmlPartialCSharpAnalyzerTest : CSharpAnalyzerTest { - public AvoidHtmlPartialCSharpAnalzyerTest(ImmutableArray metadataReferences) + public AvoidHtmlPartialCSharpAnalyzerTest(ImmutableArray metadataReferences) { TestState.AdditionalReferences.AddRange(metadataReferences); } diff --git a/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj b/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj index 58253fa10667..eb6895f3e4db 100644 --- a/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj +++ b/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/Mvc/Mvc.Analyzers/test/TagHelpersInCodeBlocksAnalyzerTest.cs b/src/Mvc/Mvc.Analyzers/test/TagHelpersInCodeBlocksAnalyzerTest.cs index c47fadb7b721..fa291014b620 100644 --- a/src/Mvc/Mvc.Analyzers/test/TagHelpersInCodeBlocksAnalyzerTest.cs +++ b/src/Mvc/Mvc.Analyzers/test/TagHelpersInCodeBlocksAnalyzerTest.cs @@ -7,7 +7,6 @@ using Microsoft.CodeAnalysis.CSharp.Testing; using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Testing; -using Microsoft.CodeAnalysis.Testing.Verifiers; namespace Microsoft.AspNetCore.Mvc.Analyzers; @@ -58,7 +57,7 @@ public class DiagnosticsAreReturned_ForUseOfTagHelpersInActions : global::Micros { WriteLiteral(""\r\n""); WriteLiteral(""\r\n""); - + Action sometMethod = {|#0:() => { @@ -151,7 +150,7 @@ public class DiagnosticsAreReturned_ForUseOfTagHelpersInNonAsyncFunc : global::M { WriteLiteral(""\r\n""); WriteLiteral(""\r\n""); - + Func sometMethod = {|#0:() => { @@ -243,13 +242,13 @@ public class DiagnosticsAreReturned_ForUseOfTagHelpersInVoidClassMethods : globa public async override global::System.Threading.Tasks.Task ExecuteAsync() { WriteLiteral(""\r\n""); - + SometMethod(); WriteLiteral(""\r\n""); } #pragma warning restore 1998 - + {|#0:void SometMethod() { @@ -336,7 +335,7 @@ public class DiagnosticsAreReturned_ForUseOfTagHelpersInVoidDelegates : global:: { WriteLiteral(""\r\n""); WriteLiteral(""\r\n""); - + TestDelegate sometMethod = {|#0:delegate () { @@ -368,7 +367,7 @@ public class DiagnosticsAreReturned_ForUseOfTagHelpersInVoidDelegates : global:: WriteLiteral(""\r\n""); } #pragma warning restore 1998 - + delegate void TestDelegate(); [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] @@ -430,7 +429,7 @@ public class DiagnosticsAreReturned_ForUseOfTagHelpersInVoidLocalFunctions : glo public async override global::System.Threading.Tasks.Task ExecuteAsync() { WriteLiteral(""\r\n""); - + {|#0:void SometMethod() { @@ -520,13 +519,13 @@ public class NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncClassMethods_ : g public async override global::System.Threading.Tasks.Task ExecuteAsync() { WriteLiteral(""\r\n""); - + await SometMethod(); WriteLiteral(""\r\n""); } #pragma warning restore 1998 - + async Task SometMethod() { @@ -611,7 +610,7 @@ public class NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncDelegates_ : glob { WriteLiteral(""\r\n""); WriteLiteral(""\r\n""); - + TestDelegate sometMethod = async delegate () { @@ -643,7 +642,7 @@ public class NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncDelegates_ : glob WriteLiteral(""\r\n""); } #pragma warning restore 1998 - + delegate Task TestDelegate(); [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] @@ -707,7 +706,7 @@ public class NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncLocalFunctions_ : public async override global::System.Threading.Tasks.Task ExecuteAsync() { WriteLiteral(""\r\n""); - + async Task SometMethod() { @@ -794,13 +793,13 @@ public class SingleDiagnosticIsReturned_ForMultipleTagHelpersInVoidMethod : glob public async override global::System.Threading.Tasks.Task ExecuteAsync() { WriteLiteral(""\r\n""); - + SometMethod(); WriteLiteral(""\r\n""); } #pragma warning restore 1998 - + {|#0:void SometMethod() { @@ -898,7 +897,7 @@ public class SingleDiagnosticIsReturned_ForMultipleTagHelpersInVoidMethod : glob private static Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected) { - var test = new TagHelpersInCodeBlocksCSharpAnalzyerTest(TestReferences.MetadataReferences) + var test = new TagHelpersInCodeBlocksCSharpAnalyzerTest(TestReferences.MetadataReferences) { TestCode = source, ReferenceAssemblies = TestReferences.EmptyReferenceAssemblies, @@ -908,9 +907,9 @@ private static Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] return test.RunAsync(); } - private sealed class TagHelpersInCodeBlocksCSharpAnalzyerTest : CSharpAnalyzerTest + private sealed class TagHelpersInCodeBlocksCSharpAnalyzerTest : CSharpAnalyzerTest { - public TagHelpersInCodeBlocksCSharpAnalzyerTest(ImmutableArray metadataReferences) + public TagHelpersInCodeBlocksCSharpAnalyzerTest(ImmutableArray metadataReferences) { TestState.AdditionalReferences.AddRange(metadataReferences); } diff --git a/src/Mvc/Mvc.Analyzers/test/TopLevelParameterNameAnalyzerTest.cs b/src/Mvc/Mvc.Analyzers/test/TopLevelParameterNameAnalyzerTest.cs index 50fb4048110b..5a176ccaf3f4 100644 --- a/src/Mvc/Mvc.Analyzers/test/TopLevelParameterNameAnalyzerTest.cs +++ b/src/Mvc/Mvc.Analyzers/test/TopLevelParameterNameAnalyzerTest.cs @@ -7,7 +7,6 @@ using Microsoft.CodeAnalysis.CSharp.Testing; using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Testing; -using Microsoft.CodeAnalysis.Testing.Verifiers; namespace Microsoft.AspNetCore.Mvc.Analyzers; @@ -596,7 +595,7 @@ private static Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] return test.RunAsync(); } - internal sealed class TopLevelParameterNameCSharpAnalyzerTest : CSharpAnalyzerTest + internal sealed class TopLevelParameterNameCSharpAnalyzerTest : CSharpAnalyzerTest { public TopLevelParameterNameCSharpAnalyzerTest(ImmutableArray metadataReferences) { diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.en.json index 5ad4270f3018..7d96522590eb 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.en.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.en.json @@ -21,13 +21,13 @@ "symbols/InteractivityPlatform/choices/WebAssembly/description": "Runs in the browser using WebAssembly", "symbols/InteractivityPlatform/choices/Auto/displayName": "Auto (Server and WebAssembly)", "symbols/InteractivityPlatform/choices/Auto/description": "Uses Server while downloading WebAssembly assets, then uses WebAssembly", - "symbols/InteractivityLocation/displayName": "_Interactivity location", + "symbols/InteractivityLocation/displayName": "Interactivity _location", "symbols/InteractivityLocation/description": "Chooses which components will have interactive rendering enabled", "symbols/InteractivityLocation/choices/InteractivePerPage/displayName": "Per page/component", "symbols/InteractivityLocation/choices/InteractivePerPage/description": "Interactivity is applied on a per-page or per-component basis", "symbols/InteractivityLocation/choices/InteractiveGlobal/displayName": "Global", "symbols/InteractivityLocation/choices/InteractiveGlobal/description": "Interactivity is applied at the root level", - "symbols/IncludeSampleContent/displayName": "_Include sample pages", + "symbols/IncludeSampleContent/displayName": "Include _sample pages", "symbols/IncludeSampleContent/description": "Configures whether to add sample pages and styling to demonstrate basic usage patterns.", "symbols/Empty/description": "Configures whether to omit sample pages and styling that demonstrate basic usage patterns.", "symbols/auth/choices/None/description": "No authentication",