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

Make a source-build targetted fix to unblock release

Browse source
This commit is contained in:
Michael Simons 2022-03-17 12:38:23 -05:00
parent fe2e9b9fb8
commit aff4e2553e
1 changed files with 87 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/redist/targets/BundledTemplates.targets
View file

@ -20,7 +20,6 @@
</Target> </Target>
<Target Name="DownloadBundledTemplateNupkgs">
<ItemGroup> <ItemGroup>
<Bundled60Templates Include="Microsoft.DotNet.Common.ItemTemplates" PackageVersion="$(MicrosoftDotNetCommonItemTemplates60PackageVersion)" /> <Bundled60Templates Include="Microsoft.DotNet.Common.ItemTemplates" PackageVersion="$(MicrosoftDotNetCommonItemTemplates60PackageVersion)" />
<Bundled60Templates Include="Microsoft.DotNet.Common.ProjectTemplates.6.0" PackageVersion="$(MicrosoftDotNetCommonProjectTemplates60PackageVersion)" /> <Bundled60Templates Include="Microsoft.DotNet.Common.ProjectTemplates.6.0" PackageVersion="$(MicrosoftDotNetCommonProjectTemplates60PackageVersion)" />
@ -98,15 +97,17 @@
<ItemGroup> <ItemGroup>
<BundledTemplates Include="@(CurrentVersionBundledTemplates)" /> <BundledTemplates Include="@(CurrentVersionBundledTemplates)" />
<BundledTemplates Include="@(PreviousVersionBundledTemplates)" Condition="$(ProductMonikerRid.StartsWith('win'))" /> <BundledTemplates Include="@(PreviousVersionBundledTemplates)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<BundledTemplates Update="@(BundledTemplates)"> <BundledTemplates Update="@(BundledTemplates)">
<RestoredNupkgPath>$(NuGetPackageRoot)$([System.String]::copy('%(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg').ToLower())</RestoredNupkgPath> <NupkgPathRelativeToPackageRoot>%(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg</NupkgPathRelativeToPackageRoot>
<RestoredNupkgPath>$(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower())</RestoredNupkgPath>
</BundledTemplates> </BundledTemplates>
</ItemGroup> </ItemGroup>
<Target Name="DownloadBundledTemplateNupkgs">
<CollatePackageDownloads Packages="@(BundledTemplates)"> <CollatePackageDownloads Packages="@(BundledTemplates)">
<Output TaskParameter="PackageDownloads" ItemName="BundledTemplatePackageDownload" /> <Output TaskParameter="PackageDownloads" ItemName="BundledTemplatePackageDownload" />
</CollatePackageDownloads> </CollatePackageDownloads>