mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[automated] Merge branch 'release/7.0.3xx' => 'main' (#15601)

Browse source
This commit is contained in:
Daniel Plaisted 2023-02-22 12:40:06 -05:00 • committed by GitHub
commit 2d4c8c4357
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs
View file

@ -53,7 +53,7 @@ namespace Microsoft.DotNet.Cli.Build
foreach (var file in files) foreach (var file in files)
{ {
sb.Append(@" file source=""!(bindpath.sources)\Redist\Common\NetCoreSDK\MSBuildExtensions\"); sb.Append(@" file source=""$(PkgVS_Redist_Common_Net_Core_SDK_MSBuildExtensions)\");
sb.Append(Path.Combine(relativeSourcePath, Path.GetFileName(file))); sb.Append(Path.Combine(relativeSourcePath, Path.GetFileName(file)));
sb.AppendLine("\""); sb.AppendLine("\"");
} }

2
src/redist/targets/GenerateBundledVersions.targets
View file

@ -70,7 +70,7 @@
<VersionFeature21>30</VersionFeature21> <VersionFeature21>30</VersionFeature21>
<VersionFeature31>32</VersionFeature31> <VersionFeature31>32</VersionFeature31>
<VersionFeature50>17</VersionFeature50> <VersionFeature50>17</VersionFeature50>
<VersionFeature60>13</VersionFeature60> <VersionFeature60>14</VersionFeature60>
<VersionFeature70>2</VersionFeature70> <VersionFeature70>2</VersionFeature70>
</PropertyGroup> </PropertyGroup>