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

Minor updates to variable names

Browse source
This commit is contained in:
jbeisner 2019-07-22 22:26:51 +00:00
parent f55ddb8a15
commit f31451cbc0
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="Calculate30TemplatesVersion" <Target Name="CalculateTemplatesVersions"
DependsOnTargets="SetSdkVersionInfo"> DependsOnTargets="SetSdkVersionInfo">
<PropertyGroup> <PropertyGroup>
<AspNetCore30VersionPreReleaseSeparator>$(AspNetCorePackageVersionFor30Templates.IndexOf('-'))</AspNetCore30VersionPreReleaseSeparator> <AspNetCore30VersionPreReleaseSeparator>$(AspNetCorePackageVersionFor30Templates.IndexOf('-'))</AspNetCore30VersionPreReleaseSeparator>
@ -80,16 +80,20 @@
</Bundled21Templates> </Bundled21Templates>
</ItemGroup> </ItemGroup>
<!-- Restore bundled templates via PackageDownload -->
<ItemGroup> <ItemGroup>
<PackageDownload Include="@(Bundled30Templates);@(Bundled22Templates);@(Bundled21Templates)" /> <PackageDownload Include="@(Bundled22Templates);@(Bundled21Templates)" />
</ItemGroup>
<!-- Restore bundled templates via PackageReference -->
<ItemGroup>
<PackageReference Include="@(Bundled30Templates)" />
</ItemGroup> </ItemGroup>
<Target Name="LayoutTemplates" <Target Name="LayoutTemplates"
DependsOnTargets="LayoutTemplatesForSDK;LayoutTemplatesFor30MSI;LayoutTemplatesFor22MSI;LayoutTemplatesFor21MSI" /> DependsOnTargets="LayoutTemplatesForSDK;LayoutTemplatesFor30MSI;LayoutTemplatesFor22MSI;LayoutTemplatesFor21MSI" />
<Target Name="LayoutTemplatesForSDK" <Target Name="LayoutTemplatesForSDK"
DependsOnTargets="SetupBundledComponents;Calculate30TemplatesVersion"> DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersions">
<ItemGroup Condition="!$(ProductMonikerRid.StartsWith('win'))"> <ItemGroup Condition="!$(ProductMonikerRid.StartsWith('win'))">
<BundledTemplate Remove="Microsoft.Dotnet.Wpf.ProjectTemplates" /> <BundledTemplate Remove="Microsoft.Dotnet.Wpf.ProjectTemplates" />
<BundledTemplate Remove="Microsoft.Dotnet.WinForms.ProjectTemplates" /> <BundledTemplate Remove="Microsoft.Dotnet.WinForms.ProjectTemplates" />
@ -99,23 +103,23 @@
</Target> </Target>
<Target Name="LayoutTemplatesFor30MSI" <Target Name="LayoutTemplatesFor30MSI"
DependsOnTargets="SetupBundledComponents;Calculate30TemplatesVersion" DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersions"
Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))"> Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))">
<Copy SourceFiles="%(Bundled30Templates.RestoredNupkgPath)" <Copy SourceFiles="%(Bundled30Templates.RestoredNupkgPath)"
DestinationFolder="$(Templates30LayoutPath)templates/$(BundledTemplates30Version)"/> DestinationFolder="$(Templates30LayoutPath)templates/$(BundledTemplates30Version)"/>
</Target> </Target>
<Target Name="LayoutTemplatesFor22MSI" <Target Name="LayoutTemplatesFor22MSI"
DependsOnTargets="SetupBundledComponents;Calculate22TemplatesVersion" DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersions"
Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))"> Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))">
<Copy SourceFiles="%(Bundled22Templates.RestoredNupkgPath)" <Copy SourceFiles="%(Bundled22Templates.RestoredNupkgPath)"
DestinationFolder="$(Templates22LayoutPath)templates/$(BundledTemplates22InstallPath)"/> DestinationFolder="$(Templates22LayoutPath)templates/$(BundledTemplates22InstallPath)"/>
</Target> </Target>
<Target Name="LayoutTemplatesFor22MSI" <Target Name="LayoutTemplatesFor21MSI"
DependsOnTargets="SetupBundledComponents;Calculate22TemplatesVersion" DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersions"
Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))"> Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))">
<Copy SourceFiles="%(Bundled22Templates.RestoredNupkgPath)" <Copy SourceFiles="%(Bundled21Templates.RestoredNupkgPath)"
DestinationFolder="$(Templates22LayoutPath)templates/$(BundledTemplates22InstallPath)"/> DestinationFolder="$(Templates21LayoutPath)templates/$(BundledTemplates21InstallPath)"/>
</Target> </Target>
</Project> </Project>