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

Remove workaround for aspnet/AspNetCore#8835 (#2170)

Browse source 
* Remove workaround for aspnet/AspNetCore#8835

* Update GenerateLayout.targets

* Update ASP.NET Core to 3.0.0-preview6-19279-08
This commit is contained in:
Nate McMaster 2019-05-30 10:48:46 -07:00 • committed by GitHub
parent db69c4f0c6
commit a0107cdb1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

24
eng/Version.Details.xml
View file

@ -14,29 +14,29 @@
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>63abc77da6d99470caa5bfa0465afe244105e595</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-preview6-19279-01">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-preview6-19279-08">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>760df198c8494001f8fa860d0b57f6c6a49c06eb</Sha>
<Sha>0b54783877cca229e2fc3f772ce7257cf0b3814f</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0-preview6-19279-01">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0-preview6-19279-08">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>760df198c8494001f8fa860d0b57f6c6a49c06eb</Sha>
<Sha>0b54783877cca229e2fc3f772ce7257cf0b3814f</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.0-preview6-19279-01">
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.0-preview6-19279-08">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>760df198c8494001f8fa860d0b57f6c6a49c06eb</Sha>
<Sha>0b54783877cca229e2fc3f772ce7257cf0b3814f</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="3.0.0-preview6-19279-01">
<Dependency Name="dotnet-dev-certs" Version="3.0.0-preview6-19279-08">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>760df198c8494001f8fa860d0b57f6c6a49c06eb</Sha>
<Sha>0b54783877cca229e2fc3f772ce7257cf0b3814f</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="3.0.0-preview6-19279-01">
<Dependency Name="dotnet-user-secrets" Version="3.0.0-preview6-19279-08">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>760df198c8494001f8fa860d0b57f6c6a49c06eb</Sha>
<Sha>0b54783877cca229e2fc3f772ce7257cf0b3814f</Sha>
</Dependency>
<Dependency Name="dotnet-watch" Version="3.0.0-preview6-19279-01">
<Dependency Name="dotnet-watch" Version="3.0.0-preview6-19279-08">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>760df198c8494001f8fa860d0b57f6c6a49c06eb</Sha>
<Sha>0b54783877cca229e2fc3f772ce7257cf0b3814f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="1.0.2-beta5.19279.2">
<Uri>https://github.com/dotnet/templating</Uri>

12
eng/Versions.props
View file

@ -24,12 +24,12 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.0-preview6-19279-01</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>3.0.0-preview6-19279-01</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-preview6-19279-01</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<dotnetdevcertsPackageVersion>3.0.0-preview6-19279-01</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>3.0.0-preview6-19279-01</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>3.0.0-preview6-19279-01</dotnetwatchPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.0-preview6-19279-08</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>3.0.0-preview6-19279-08</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-preview6-19279-08</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<dotnetdevcertsPackageVersion>3.0.0-preview6-19279-08</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>3.0.0-preview6-19279-08</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>3.0.0-preview6-19279-08</dotnetwatchPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/cli -->

6
src/redist/targets/GenerateLayout.targets
View file

@ -52,10 +52,8 @@
<DownloadedAspNetCoreSharedFxInstallerFileName Condition=" '$(InstallerExtension)' != '' AND '$(HostOSName)' != 'osx' ">aspnetcore-runtime-$(AspNetCoreVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)</DownloadedAspNetCoreSharedFxInstallerFileName>
<!-- Note: we use the "-internal" archives and installers that contain only the aspnetcore shared framework, and shouldn't overlap with Microsoft.NETCore.App. -->
<DownloadedAspNetCoreSharedFxInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib</DownloadedAspNetCoreSharedFxInstallerFileName>
<DownloadedAspNetTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">aspnetcore-targeting-pack-$(AspNetTargetingPackVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
<!-- AspNet targeting pack assets have unexpected asset names for DEB and tar.gz types:
https://github.com/aspnet/AspNetCore/issues/8835 -->
<DownloadedAspNetTargetingPackInstallerFileName Condition=" '$(IsDebianBaseDistro)' == 'true' ">aspnetcore-targeting-pack-$(AspNetTargetingPackVersion)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
<DownloadedAspNetTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">aspnetcore-targeting-pack-$(AspNetTargetingPackVersion)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
<DownloadedAspNetTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-targeting-pack-$(AspNetTargetingPackVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
<AspNetTargetingPackArchiveFileName>aspnetcore-targeting-pack-$(AspNetCoreVersion)$(ArchiveExtension)</AspNetTargetingPackArchiveFileName>
<AspNetCoreSharedFxArchiveFileName>aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension)</AspNetCoreSharedFxArchiveFileName>
<WinFormsAndWpfSharedFxArchiveFileName>windowsdesktop-runtime-$(MicrosoftWindowsDesktopPackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</WinFormsAndWpfSharedFxArchiveFileName>