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

Merge pull request #89 from dsplaisted/update-desktopui

Browse source 
Insert updated DesktopUI
This commit is contained in:
Daniel Plaisted 2018-09-24 16:59:00 -07:00 committed by GitHub
commit 5a14412a49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 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> <DownloadedSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName>
<DownloadedSharedFrameworkInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedSharedFrameworkInstallerFileName)</DownloadedSharedFrameworkInstallerFile> <DownloadedSharedFrameworkInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedSharedFrameworkInstallerFileName)</DownloadedSharedFrameworkInstallerFile>
<DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-extension-$(MicrosoftPrivateWpfPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName> <DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-extension-$(MicrosoftDesktopUIPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName>
<DownloadedWinFormsAndWpfSharedFrameworkInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName)</DownloadedWinFormsAndWpfSharedFrameworkInstallerFile> <DownloadedWinFormsAndWpfSharedFrameworkInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName)</DownloadedWinFormsAndWpfSharedFrameworkInstallerFile>
<!-- Use the portable "linux-x64" Rid when downloading Linux shared framework compressed file. --> <!-- 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> <AspNetCoreSharedFxArchiveFileName>aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension)</AspNetCoreSharedFxArchiveFileName>
<AspNetCoreSharedFxArchiveFile>$(PackagesDirectory)/$(AspNetCoreSharedFxArchiveFileName)</AspNetCoreSharedFxArchiveFile> <AspNetCoreSharedFxArchiveFile>$(PackagesDirectory)/$(AspNetCoreSharedFxArchiveFileName)</AspNetCoreSharedFxArchiveFile>
<WinFormsAndWpfSharedFxArchiveFileName>dotnet-extension-$(MicrosoftPrivateWpfPackageVersion)-$(Architecture)$(ArchiveExtension)</WinFormsAndWpfSharedFxArchiveFileName> <WinFormsAndWpfSharedFxArchiveFileName>dotnet-extension-$(MicrosoftDesktopUIPackageVersion)-$(Architecture)$(ArchiveExtension)</WinFormsAndWpfSharedFxArchiveFileName>
<WinFormsAndWpfSharedFxArchiveFile>$(PackagesDirectory)/$(WinFormsAndWpfSharedFxArchiveFileName)</WinFormsAndWpfSharedFxArchiveFile> <WinFormsAndWpfSharedFxArchiveFile>$(PackagesDirectory)/$(WinFormsAndWpfSharedFxArchiveFileName)</WinFormsAndWpfSharedFxArchiveFile>
<!-- Used to detect if ASP.NET Core is built against the same version of Microsoft.NETCore.App. --> <!-- 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' "> <ItemGroup Condition=" '$(IncludeWpfAndWinForms)' != 'false' ">
<_DownloadAndExtractItem Include="WinFormsAndWpfSharedFxArchiveFile" <_DownloadAndExtractItem Include="WinFormsAndWpfSharedFxArchiveFile"
Condition="!Exists('$(WinFormsAndWpfSharedFxArchiveFile)')"> Condition="!Exists('$(WinFormsAndWpfSharedFxArchiveFile)')">
<Url>$(WinFormsAndWpfSharedFxRootUrl)$(MicrosoftPrivateWpfPackageVersion)/$(WinFormsAndWpfSharedFxArchiveFileName)$(CoreSetupBlobAccessTokenParam)</Url> <Url>$(WinFormsAndWpfSharedFxRootUrl)$(MicrosoftDesktopUIPackageVersion)/$(WinFormsAndWpfSharedFxArchiveFileName)$(CoreSetupBlobAccessTokenParam)</Url>
<DownloadFileName>$(WinFormsAndWpfSharedFxArchiveFile)</DownloadFileName> <DownloadFileName>$(WinFormsAndWpfSharedFxArchiveFile)</DownloadFileName>
<ExtractDestination>$(WinFormsAndWpfSharedFxPublishDirectory)/shared</ExtractDestination> <ExtractDestination>$(WinFormsAndWpfSharedFxPublishDirectory)/shared</ExtractDestination>
</_DownloadAndExtractItem> </_DownloadAndExtractItem>
<_DownloadAndExtractItem Include="DownloadedWinFormsAndWpfSharedFrameworkInstallerFile" <_DownloadAndExtractItem Include="DownloadedWinFormsAndWpfSharedFrameworkInstallerFile"
Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))"> Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
<Url>$(WinFormsAndWpfSharedFxRootUrl)$(MicrosoftPrivateWpfPackageVersion)/$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName)$(CoreSetupBlobAccessTokenParam)</Url> <Url>$(WinFormsAndWpfSharedFxRootUrl)$(MicrosoftDesktopUIPackageVersion)/$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName)$(CoreSetupBlobAccessTokenParam)</Url>
<DownloadFileName>$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFile)</DownloadFileName> <DownloadFileName>$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFile)</DownloadFileName>
<ExtractDestination></ExtractDestination> <ExtractDestination></ExtractDestination>
</_DownloadAndExtractItem> </_DownloadAndExtractItem>

6
build/DependencyVersions.props
View file

@ -38,9 +38,9 @@
<SharedHostVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedHostVersion> <SharedHostVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedHostVersion>
<HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion> <HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion>
<AspNetCoreVersion>$(MicrosoftAspNetCoreAppPackageVersion)</AspNetCoreVersion> <AspNetCoreVersion>$(MicrosoftAspNetCoreAppPackageVersion)</AspNetCoreVersion>
<MicrosoftPrivateWpfPackageVersion>3.0.0-alpha-26829-8</MicrosoftPrivateWpfPackageVersion> <MicrosoftDesktopUIPackageVersion>3.0.0-alpha-26921-3</MicrosoftDesktopUIPackageVersion>
<MicrosoftDotnetWpfProjectTemplatesPackageVersion>$(MicrosoftPrivateWpfPackageVersion)</MicrosoftDotnetWpfProjectTemplatesPackageVersion> <MicrosoftDotnetWpfProjectTemplatesPackageVersion>$(MicrosoftDesktopUIPackageVersion)</MicrosoftDotnetWpfProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>$(MicrosoftPrivateWpfPackageVersion)</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion> <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>$(MicrosoftDesktopUIPackageVersion)</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup> </PropertyGroup>
<!-- infrastructure and test only dependencies --> <!-- infrastructure and test only dependencies -->

6
build/MSBuildExtensions.targets
View file

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