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

Use prodcon-friendly property names for WPF package versions

Browse source
This commit is contained in:
Daniel Plaisted 2018-08-28 14:58:20 -07:00
parent 997bd7b0e6
commit 1c8984ee75
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build/BundledRuntimes.props
View file

@ -23,7 +23,7 @@
<DownloadedSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName>
<DownloadedSharedFrameworkInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedSharedFrameworkInstallerFileName)</DownloadedSharedFrameworkInstallerFile>
<DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-extension-$(WinFormsAndWpfVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName>
<DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-extension-$(MicrosoftPrivateWpfPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName>
<DownloadedWinFormsAndWpfSharedFrameworkInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName)</DownloadedWinFormsAndWpfSharedFrameworkInstallerFile>
<!-- Use the portable "linux-x64" Rid when downloading Linux shared framework compressed file. -->
@ -45,7 +45,7 @@
<AspNetCoreSharedFxArchiveFileName>aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension)</AspNetCoreSharedFxArchiveFileName>
<AspNetCoreSharedFxArchiveFile>$(PackagesDirectory)/$(AspNetCoreSharedFxArchiveFileName)</AspNetCoreSharedFxArchiveFile>
<WinFormsAndWpfSharedFxArchiveFileName>dotnet-extension-$(WinFormsAndWpfVersion)-$(Architecture)$(ArchiveExtension)</WinFormsAndWpfSharedFxArchiveFileName>
<WinFormsAndWpfSharedFxArchiveFileName>dotnet-extension-$(MicrosoftPrivateWpfPackageVersion)-$(Architecture)$(ArchiveExtension)</WinFormsAndWpfSharedFxArchiveFileName>
<WinFormsAndWpfSharedFxArchiveFile>$(PackagesDirectory)/$(WinFormsAndWpfSharedFxArchiveFileName)</WinFormsAndWpfSharedFxArchiveFile>
<!-- Used to detect if ASP.NET Core is built against the same version of Microsoft.NETCore.App. -->
@ -124,14 +124,14 @@
<ItemGroup Condition=" '$(IncludeWpfAndWinForms)' != 'false' ">
<_DownloadAndExtractItem Include="WinFormsAndWpfSharedFxArchiveFile"
Condition="!Exists('$(WinFormsAndWpfSharedFxArchiveFile)')">
<Url>$(WinFormsAndWpfSharedFxRootUrl)$(WinFormsAndWpfVersion)/$(WinFormsAndWpfSharedFxArchiveFileName)$(CoreSetupBlobAccessTokenParam)</Url>
<Url>$(WinFormsAndWpfSharedFxRootUrl)$(MicrosoftPrivateWpfPackageVersion)/$(WinFormsAndWpfSharedFxArchiveFileName)$(CoreSetupBlobAccessTokenParam)</Url>
<DownloadFileName>$(WinFormsAndWpfSharedFxArchiveFile)</DownloadFileName>
<ExtractDestination>$(WinFormsAndWpfSharedFxPublishDirectory)/shared</ExtractDestination>
</_DownloadAndExtractItem>
<_DownloadAndExtractItem Include="DownloadedWinFormsAndWpfSharedFrameworkInstallerFile"
Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
<Url>$(WinFormsAndWpfSharedFxRootUrl)$(WinFormsAndWpfVersion)/$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName)$(CoreSetupBlobAccessTokenParam)</Url>
<Url>$(WinFormsAndWpfSharedFxRootUrl)$(MicrosoftPrivateWpfPackageVersion)/$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName)$(CoreSetupBlobAccessTokenParam)</Url>
<DownloadFileName>$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFile)</DownloadFileName>
<ExtractDestination></ExtractDestination>
</_DownloadAndExtractItem>

2
build/BundledTemplates.props
View file

@ -3,7 +3,7 @@
<BundledTemplate Include="Microsoft.DotNet.Common.ItemTemplates" Version="$(MicrosoftDotNetCommonItemTemplatesPackageVersion)" />
<BundledTemplate Include="Microsoft.DotNet.Common.ProjectTemplates.2.1" Version="$(MicrosoftDotNetCommonProjectTemplates20PackageVersion)" />
<BundledTemplate Include="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="$(MicrosoftDotNetTestProjectTemplates20PackageVersion)" />
<BundledTemplate Include="Microsoft.Dotnet.Wpf.ProjectTemplates" Version="$(WpfTemplatesVersion)" />
<BundledTemplate Include="Microsoft.Dotnet.Wpf.ProjectTemplates" Version="$(MicrosoftDotnetWpfProjectTemplatesPackageVersion)" />
<BundledTemplate Include="Microsoft.DotNet.Web.ItemTemplates" Version="$(AspNetCoreVersion)" />
<BundledTemplate Include="Microsoft.DotNet.Web.ProjectTemplates.3.0" Version="$(AspNetCoreVersion)" />

4
build/DependencyVersions.props
View file

@ -39,8 +39,8 @@
<SharedHostVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedHostVersion>
<HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion>
<AspNetCoreVersion>$(MicrosoftAspNetCoreAppPackageVersion)</AspNetCoreVersion>
<WinFormsAndWpfVersion>3.0.0-alpha-26828-2</WinFormsAndWpfVersion>
<WpfTemplatesVersion>$(WinFormsAndWpfVersion)</WpfTemplatesVersion>
<MicrosoftPrivateWpfPackageVersion>3.0.0-alpha-26828-2</MicrosoftPrivateWpfPackageVersion>
<MicrosoftDotnetWpfProjectTemplatesPackageVersion>$(MicrosoftPrivateWpfPackageVersion)</MicrosoftDotnetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<!-- infrastructure and test only dependencies -->

6
build/MSBuildExtensions.targets
View file

@ -121,10 +121,10 @@ Copyright (c) .NET Foundation. All rights reserved.
<ItemGroup>
<KnownFrameworkReference Include="Microsoft.Windows.UI"
RuntimeFrameworkName="Microsoft.Private.WPF"
DefaultRuntimeFrameworkVersion="$(WinFormsAndWpfVersion)"
LatestRuntimeFrameworkVersion="$(WinFormsAndWpfVersion)"
DefaultRuntimeFrameworkVersion="$(MicrosoftPrivateWpfPackageVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftPrivateWpfPackageVersion)"
TargetingPackName="Microsoft.Private.WPF"
TargetingPackVersion="$(WinFormsAndWpfVersion)"
TargetingPackVersion="$(MicrosoftPrivateWpfPackageVersion)"
/>
<KnownFrameworkReference Include="Microsoft.AspNetCore"