Merge remote-tracking branch 'origin/main' into dev-marcink-20220628-referenceassemblies

Author: marcin-krystianc

eng/Version.Details.xml

@@ -84,30 +84,30 @@
       <Sha>ff67e1b93f4f56b1fb079695454e9415f53f7e60</Sha>
       <SourceBuildTarball RepoName="format" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.3.0-3.22327.18">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.3.0-3.22328.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>38d619cec31cf7c4c35ea2ecd5a1ab6605e0d651</Sha>
+      <Sha>52399a48b7e1fdef32dd2b381f7158f661a231e1</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis" Version="4.3.0-3.22327.18">
+    <Dependency Name="Microsoft.CodeAnalysis" Version="4.3.0-3.22328.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>38d619cec31cf7c4c35ea2ecd5a1ab6605e0d651</Sha>
+      <Sha>52399a48b7e1fdef32dd2b381f7158f661a231e1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.3.0-3.22327.18">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.3.0-3.22328.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>38d619cec31cf7c4c35ea2ecd5a1ab6605e0d651</Sha>
+      <Sha>52399a48b7e1fdef32dd2b381f7158f661a231e1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.3.0-3.22327.18">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.3.0-3.22328.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>38d619cec31cf7c4c35ea2ecd5a1ab6605e0d651</Sha>
+      <Sha>52399a48b7e1fdef32dd2b381f7158f661a231e1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.3.0-3.22327.18">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.3.0-3.22328.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>38d619cec31cf7c4c35ea2ecd5a1ab6605e0d651</Sha>
+      <Sha>52399a48b7e1fdef32dd2b381f7158f661a231e1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.3.0-3.22327.18">
+    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.3.0-3.22328.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>38d619cec31cf7c4c35ea2ecd5a1ab6605e0d651</Sha>
+      <Sha>52399a48b7e1fdef32dd2b381f7158f661a231e1</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="7.0.0-preview.7.22327.1">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>

eng/Versions.props

@@ -134,12 +134,12 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/roslyn -->
-    <MicrosoftNetCompilersToolsetPackageVersion>4.3.0-3.22327.18</MicrosoftNetCompilersToolsetPackageVersion>
-    <MicrosoftCodeAnalysisPackageVersion>4.3.0-3.22327.18</MicrosoftCodeAnalysisPackageVersion>
-    <MicrosoftCodeAnalysisCSharpPackageVersion>4.3.0-3.22327.18</MicrosoftCodeAnalysisCSharpPackageVersion>
-    <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.3.0-3.22327.18</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
-    <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.3.0-3.22327.18</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
-    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.3.0-3.22327.18</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
+    <MicrosoftNetCompilersToolsetPackageVersion>4.3.0-3.22328.1</MicrosoftNetCompilersToolsetPackageVersion>
+    <MicrosoftCodeAnalysisPackageVersion>4.3.0-3.22328.1</MicrosoftCodeAnalysisPackageVersion>
+    <MicrosoftCodeAnalysisCSharpPackageVersion>4.3.0-3.22328.1</MicrosoftCodeAnalysisCSharpPackageVersion>
+    <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.3.0-3.22328.1</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
+    <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.3.0-3.22328.1</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
+    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.3.0-3.22328.1</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
     <MicrosoftNetCompilersToolsetVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetCompilersToolsetVersion>
   </PropertyGroup>
   <PropertyGroup>

src/RazorSdk/SourceGenerators/Diagnostics/RazorSourceGeneratorResources.resx

@@ -121,7 +121,7 @@
     <value>Invalid RazorLangVersion</value>
   </data>
   <data name="InvalidRazorLangMessage" xml:space="preserve">
-    <value>Invalid value '{0}'' for RazorLangVersion. Valid values include 'Latest' or a valid version in range 1.0 to 5.0.</value>
+    <value>Invalid value '{0}'' for RazorLangVersion. Valid values include 'Latest' or a valid version in range 1.0 to 7.0.</value>
   </data>
   <data name="RecomputingTagHelpersTitle" xml:space="preserve">
     <value>Recomputing tag helpers</value>

src/RazorSdk/Targets/Sdk.Razor.CurrentVersion.targets

@@ -44,6 +44,16 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <!-- Resolve the TFM-specific attributes conditionally. -->
   <Choose>
+      <When Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND $([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '7.0')) ">
+      <PropertyGroup>
+        <_TargetingNETCoreApp30OrLater>true</_TargetingNETCoreApp30OrLater>
+        <_TargetingNET50OrLater>true</_TargetingNET50OrLater>
+        <_TargetingNET60OrLater>true</_TargetingNET60OrLater>
+        <_TargetingNET70OrLater>true</_TargetingNET70OrLater>
+        <UseRazorSourceGenerator Condition="'$(Language)' == 'C#' AND '$(UseRazorSourceGenerator)' == '' ">true</UseRazorSourceGenerator>
+        <RazorLangVersion Condition="'$(RazorLangVersion)' == '' ">7.0</RazorLangVersion>
+      </PropertyGroup>
+    </When>
     <When Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND $([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '6.0')) ">
       <PropertyGroup>
         <_TargetingNETCoreApp30OrLater>true</_TargetingNETCoreApp30OrLater>