Merge pull request #44174 from dotnet-maestro-bot/merge/release/7.0-to-main

[automated] Merge branch 'release/7.0' => 'main'

Author: msftbot[bot]

src/ProjectTemplates/Web.Client.ItemTemplates/content/Less/.template.config/template.json

@@ -7,7 +7,7 @@
   "description": "LESS is a language that compiles into CSS",
   "groupIdentity": "Microsoft.DotNet.Web.ClientItems.Less",
   "precedence": "100",
-  "identity": "Microsoft.DotNet.Web.ClientItems.Less",
+  "identity": "Microsoft.DotNet.Web.ClientItems.Less.7.0",
   "shortName": "less",
   "sourceName": "styleSheet1",
   "tags": {

src/ProjectTemplates/Web.Client.ItemTemplates/content/Scss/.template.config/template.json

@@ -7,7 +7,7 @@
   "description": "SCSS is a language that compiles into CSS",
   "groupIdentity": "Microsoft.DotNet.Web.ClientItems.Scss",
   "precedence": "100",
-  "identity": "Microsoft.DotNet.Web.ClientItems.Scss",
+  "identity": "Microsoft.DotNet.Web.ClientItems.Scss.7.0",
   "shortName": "scss",
   "sourceName": "styleSheet1",
   "tags": {

src/ProjectTemplates/Web.Client.ItemTemplates/content/TypeScript/.template.config/template.json

@@ -7,7 +7,7 @@
   "description": "A blank TypeScript source file",
   "groupIdentity": "Microsoft.DotNet.Web.ClientItems.TypeScript",
   "precedence": "100",
-  "identity": "Microsoft.DotNet.Web.ClientItems.TypeScript",
+  "identity": "Microsoft.DotNet.Web.ClientItems.TypeScript.7.0",
   "shortName": "tsfile",
   "sourceName": "file1",
   "tags": {

src/ProjectTemplates/Web.ItemTemplates/content/Protobuf/.template.config/template.json

@@ -12,9 +12,9 @@
     "language": "",
     "type": "item"
   },
-  "groupIdentity": "Microsoft.Web.Grpc.Protobuf.6.0",
+  "groupIdentity": "Microsoft.Web.Grpc.Protobuf",
   "precedence": "600",
-  "identity": "Microsoft.Web.Grpc.Protobuf",
+  "identity": "Microsoft.Web.Grpc.Protobuf.7.0",
   "shortname": "proto",
   "sourceName": "protobuf",
   "primaryOutputs": [

src/ProjectTemplates/Web.ItemTemplates/content/RazorComponent/.template.config/template.json

@@ -14,7 +14,7 @@
   },
   "groupIdentity": "Microsoft.AspNetCore.Components.RazorComponent",
   "precedence": "600",
-  "identity": "Microsoft.AspNetCore.Components.RazorComponent.6.0",
+  "identity": "Microsoft.AspNetCore.Components.RazorComponent.7.0",
   "shortname": "razorcomponent",
   "sourceName": "Component1",
   "primaryOutputs": [

src/ProjectTemplates/Web.ItemTemplates/content/RazorPage/.template.config/template.json

@@ -11,7 +11,7 @@
   },
   "groupIdentity": "Microsoft.AspNetCore.Mvc.RazorPage",
   "precedence": "600",
-  "identity": "Microsoft.AspNetCore.Mvc.RazorPage.6.0",
+  "identity": "Microsoft.AspNetCore.Mvc.RazorPage.7.0",
   "shortName": "page",
   "sourceName": "Index",
   "primaryOutputs": [

src/ProjectTemplates/Web.ItemTemplates/content/ViewImports/.template.config/template.json

@@ -11,7 +11,7 @@
   },
   "groupIdentity": "Microsoft.AspNetCore.Mvc.ViewImports",
   "precedence": "600",
-  "identity": "Microsoft.AspNetCore.Mvc.ViewImports.6.0",
+  "identity": "Microsoft.AspNetCore.Mvc.ViewImports.7.0",
   "shortName": "viewimports",
   "sourceName": "ignoreme",
   "primaryOutputs": [

src/ProjectTemplates/Web.ItemTemplates/content/ViewStart/.template.config/template.json

@@ -11,7 +11,7 @@
   },
   "groupIdentity": "Microsoft.AspNetCore.Mvc.ViewStart",
   "precedence": "600",
-  "identity": "Microsoft.AspNetCore.Mvc.ViewStart.6.0",
+  "identity": "Microsoft.AspNetCore.Mvc.ViewStart.7.0",
   "shortName": "viewstart",
   "sourceName": "ignoreme",
   "primaryOutputs": [

src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj

@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <!-- Included primarily to ensure dotnet-getdocument and GetDocument.Insider can be referenced. -->
-    <TargetFrameworks>netcoreapp2.1;$(DefaultNetFxTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;$(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework)</TargetFrameworks>
 
     <Description>MSBuild tasks and targets for build-time Swagger and OpenApi document generation</Description>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
@@ -19,7 +19,7 @@
       because publish output matches what was built.
     -->
     <Reference Include="dotnet-getdocument"
-      Condition=" '$(TargetFramework)' == 'netcoreapp2.1' "
+      Condition=" '$(TargetFramework)' != '$(DefaultNetFxTargetFramework)' "
       Targets="Publish"
       Private="false"
       ReferenceOutputAssembly="false"
@@ -28,7 +28,7 @@
       Private="false"
       ReferenceOutputAssembly="false"
       SkipGetTargetFrameworkProperties="true">
-        <Targets Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">Publish</Targets>
+        <Targets Condition=" '$(TargetFramework)' != '$(DefaultNetFxTargetFramework)' ">Publish</Targets>
     </Reference>
   </ItemGroup>
 

src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.8">
     $CommonMetadataElements$
@@ -12,5 +12,6 @@
     <file src="$artifactsBinDir$\GetDocument.Insider\$configuration$\net462\*.*" target="tools\net462" />
     <file src="$artifactsBinDir$\GetDocument.Insider\x86\$configuration$\net462\*.*" target="tools\net462-x86" />
     <file src="$artifactsBinDir$\GetDocument.Insider\$configuration$\netcoreapp2.1\publish\*.*" target="tools\netcoreapp2.1" />
+    <file src="$artifactsBinDir$\GetDocument.Insider\$configuration$\net7.0\publish\*.*" target="tools\net7.0" />
   </files>
 </package>