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

Update to aspnetcore 2.1.0-preview1-28042

Browse source 
- Update to 2.1.0-preview1-28042
 - Remove references to the aspnetcore-store package
 - Allow pulling aspnetcore from orchestrated build
This commit is contained in:
Nate McMaster 2018-01-10 09:05:49 -08:00
parent 3f70aa89b1
commit 3e05d2495a
4 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build/DependencyVersions.props
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<MicrosoftAspNetCoreAllPackageVersion>2.1.0-preview1-28042</MicrosoftAspNetCoreAllPackageVersion>
<MicrosoftNETCoreAppPackageVersion>2.1.0-preview1-26109-02</MicrosoftNETCoreAppPackageVersion> <MicrosoftNETCoreAppPackageVersion>2.1.0-preview1-26109-02</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion> <MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftBuildPackageVersion>15.6.0-preview-000022-1216653</MicrosoftBuildPackageVersion> <MicrosoftBuildPackageVersion>15.6.0-preview-000022-1216653</MicrosoftBuildPackageVersion>
@ -58,12 +59,9 @@
<PropertyGroup> <PropertyGroup>
<CLI_NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-25908-02</CLI_NETStandardLibraryNETFrameworkVersion> <CLI_NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-25908-02</CLI_NETStandardLibraryNETFrameworkVersion>
<!-- When ready to pull aspnetcore directly from orchestrated build, move this above the import to OrchestratedPackageVersionsProps. -->
<MicrosoftAspNetCoreAppPackageVersion>2.1.0-preview1-28031</MicrosoftAspNetCoreAppPackageVersion>
<SharedHostVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedHostVersion> <SharedHostVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedHostVersion>
<HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion> <HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion>
<AspNetCoreVersion>$(MicrosoftAspNetCoreAppPackageVersion)</AspNetCoreVersion> <AspNetCoreVersion>$(MicrosoftAspNetCoreAllPackageVersion)</AspNetCoreVersion>
</PropertyGroup> </PropertyGroup>
<!-- infrastructure and test only dependencies --> <!-- infrastructure and test only dependencies -->

4
build/package/Installer.DEB.proj
View file

@ -15,10 +15,8 @@
<Target Name="GetAspNetSharedFxInstallArgs" DependsOnTargets="EvaluateRuntimeCoherence"> <Target Name="GetAspNetSharedFxInstallArgs" DependsOnTargets="EvaluateRuntimeCoherence">
<PropertyGroup> <PropertyGroup>
<!-- Ignored for now while the "trampoline" host feature is in progress -->
<InstallAspNetCoreSharedFxArgs> --ignore-depends=aspnetcore-store-2.0.3</InstallAspNetCoreSharedFxArgs>
<!-- Ignored because versions of aspnetcore-runtime may be in incoherent with the version of dotnet-runtime we want to use. --> <!-- Ignored because versions of aspnetcore-runtime may be in incoherent with the version of dotnet-runtime we want to use. -->
<InstallAspNetCoreSharedFxArgs>$(InstallAspNetCoreSharedFxArgs) --ignore-depends=dotnet-runtime-$(AspNetCoreSharedFxBaseRuntimeVersion)</InstallAspNetCoreSharedFxArgs> <InstallAspNetCoreSharedFxArgs>--ignore-depends=dotnet-runtime-$(AspNetCoreSharedFxBaseRuntimeVersion)</InstallAspNetCoreSharedFxArgs>
</PropertyGroup> </PropertyGroup>
</Target> </Target>

2
scripts/obtain/uninstall/dotnet-uninstall-debian-packages.sh
View file

@ -14,11 +14,9 @@ fi
host_package_name="dotnet-host" host_package_name="dotnet-host"
aspnetcore_runtime_package_name="^aspnetcore-runtime.*" aspnetcore_runtime_package_name="^aspnetcore-runtime.*"
aspnetcore_package_store_package_name="^aspnetcore-store.*"
remove_all(){ remove_all(){
apt-get purge -y $aspnetcore_runtime_package_name apt-get purge -y $aspnetcore_runtime_package_name
apt-get purge -y $aspnetcore_package_store_package_name
apt-get purge -y $host_package_name apt-get purge -y $host_package_name
} }

2
scripts/obtain/uninstall/dotnet-uninstall-rpm-packages.sh
View file

@ -13,12 +13,10 @@ if [ $current_userid -ne 0 ]; then
fi fi
host_package_name="dotnet-host" host_package_name="dotnet-host"
aspnetcore_package_store_package_name="aspnetcore-store*"
aspnetcore_runtime_package_name="aspnetcore-runtime*" aspnetcore_runtime_package_name="aspnetcore-runtime*"
remove_all(){ remove_all(){
yum remove -y $host_package_name yum remove -y $host_package_name
yum remove -y $aspnetcore_package_store_package_name
yum remove -y $aspnetcore_runtime_package_name yum remove -y $aspnetcore_runtime_package_name
} }