Merge in 'release/7.0' changes

dotnet-bot · dotnet-bot · commit b9192967a7db · 2024-02-07T23:08:20.000Z
diff --git a/eng/Tools.props b/eng/Tools.props
@@ -7,7 +7,7 @@
       Since this project is evaluated before .npmproj files are loaded, this should cause the package to end up in
       the NuGet cache ahead of time. This is not needed in source build.
     -->
-    <PackageReference Include="Yarn.MSBuild" Version="1.22.10" />
+    <PackageReference Include="Yarn.MSBuild" Version="1.22.19" />
   </ItemGroup>
 
   <!-- Update the generated files when we restore projects. Skip in desktop msbuild due to VS 16.8 requirements. -->
diff --git a/global.json b/global.json
@@ -26,7 +26,7 @@
     "xcopy-msbuild": "17.1.0"
   },
   "msbuild-sdks": {
-    "Yarn.MSBuild": "1.22.10",
+    "Yarn.MSBuild": "1.22.19",
     "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23564.5",
     "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23564.5"
   }

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`"xcopy-msbuild": "17.1.0"`
`27`	`27`	`},`
`28`	`28`	`"msbuild-sdks": {`
`29`		`- "Yarn.MSBuild": "1.22.10",`
	`29`	`+ "Yarn.MSBuild": "1.22.19",`
`30`	`30`	`"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23564.5",`
`31`	`31`	`"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23564.5"`
`32`	`32`	`}`